Skip to content

Commit 69b1464

Browse files
committed
Minor fixes
1 parent 98ac3ce commit 69b1464

File tree

7 files changed

+17
-18
lines changed

7 files changed

+17
-18
lines changed

+DSS_MATLAB/ICktElement.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,9 @@
160160

161161
function result = Properties(obj, NameOrIdx)
162162
if ischar(NameOrIdx) | isstring(NameOrIdx)
163-
calllib('dss_capi_v7', 'DSSProperty_Set_Name', NameOrIdx);
163+
calllib('dss_capi', 'DSSProperty_Set_Name', NameOrIdx);
164164
elseif isinteger(NameOrIdx)
165-
calllib('dss_capi_v7', 'DSSProperty_Set_Index', NameOrIdx);
165+
calllib('dss_capi', 'DSSProperty_Set_Index', NameOrIdx);
166166
else
167167
ME = MException(['DSS_MATLAB:Error'], 'Expected char, string or integer');
168168
throw(ME);

+DSS_MATLAB/ICtrlQueue.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105

106106
function result = get.Action(obj)
107107
% (write-only) Set the active action by index
108-
raise AttributeError('This property is write-only!')
108+
ME = MException(['DSS_MATLAB:Error'], 'This property is write-only!'); throw(ME);
109109
end
110110
function obj = set.Action(obj, Param1)
111111
calllib(obj.libname, 'CtrlQueue_Set_Action', Param1);

+DSS_MATLAB/IDSSProgress.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
function result = get.Caption(obj)
3636
% (write-only) Caption to appear on the bottom of the DSS Progress form.
37-
raise AttributeError('This property is write-only!')
37+
ME = MException(['DSS_MATLAB:Error'], 'This property is write-only!'); throw(ME);
3838
end
3939
function obj = set.Caption(obj, Value)
4040
calllib(obj.libname, 'DSSProgress_Set_Caption', Value);
@@ -43,7 +43,7 @@ raise AttributeError('This property is write-only!')
4343

4444
function result = get.PctProgress(obj)
4545
% (write-only) Percent progress to indicate [0..100]
46-
raise AttributeError('This property is write-only!')
46+
ME = MException(['DSS_MATLAB:Error'], 'This property is write-only!'); throw(ME);
4747
end
4848
function obj = set.PctProgress(obj, Value)
4949
calllib(obj.libname, 'DSSProgress_Set_PctProgress', Value);

+DSS_MATLAB/IMeters.m

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,8 +395,7 @@
395395
result = obj.apiutil.get_string_array('Meters_Get_ZonePCE');
396396
obj.CheckForError();
397397
if (~result)
398-
result = [% NONE
399-
];
398+
result = {};
400399
end
401400
result = result;
402401
end

+DSS_MATLAB/ISettings.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@
229229

230230
function result = get.AllocationFactors(obj)
231231
% (write-only) Sets all load allocation factors for all loads defined by XFKVA property to this value.
232-
raise AttributeError('This property is write-only!')
232+
ME = MException(['DSS_MATLAB:Error'], 'This property is write-only!'); throw(ME);
233233
end
234234
function obj = set.AllocationFactors(obj, Value)
235235
calllib(obj.libname, 'Settings_Set_AllocationFactors', Value);

+DSS_MATLAB/ISolution.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@
563563

564564
function result = get.StepsizeHr(obj)
565565
% (write-only) Set Stepsize in Hr
566-
raise AttributeError('This property is write-only!')
566+
ME = MException(['DSS_MATLAB:Error'], 'This property is write-only!'); throw(ME);
567567
end
568568
function obj = set.StepsizeHr(obj, Value)
569569
calllib(obj.libname, 'Solution_Set_StepsizeHr', Value);
@@ -572,7 +572,7 @@ raise AttributeError('This property is write-only!')
572572

573573
function result = get.StepsizeMin(obj)
574574
% (write-only) Set Stepsize in minutes
575-
raise AttributeError('This property is write-only!')
575+
ME = MException(['DSS_MATLAB:Error'], 'This property is write-only!'); throw(ME);
576576
end
577577
function obj = set.StepsizeMin(obj, Value)
578578
calllib(obj.libname, 'Solution_Set_StepsizeMin', Value);

.travis.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ language: generic
22

33
env:
44
global:
5-
- DSS_CAPI_VERSION=0.10.7-1
6-
- DSS_MATLAB_VERSION=0.10.7-1
5+
- DSS_CAPI_VERSION=0.12.0
6+
- DSS_MATLAB_VERSION=0.12.0
77

88
matrix:
99
include:
@@ -16,8 +16,8 @@ matrix:
1616
- tar zxf dss_capi.tar.gz
1717
- mkdir -p release/dss_matlab
1818
- cp -R "+DSS_MATLAB" "release/dss_matlab/+DSS_MATLAB"
19-
- mv dss_capi/lib/${TRAVIS_JOB_NAME}/libdss_capi_v7.so "release/dss_matlab/+DSS_MATLAB/dss_capi_v7.so"
20-
- mv dss_capi/lib/${TRAVIS_JOB_NAME}/libdss_capi_v7d.so "release/dss_matlab/+DSS_MATLAB/dss_capi_v7d.so"
19+
- mv dss_capi/lib/${TRAVIS_JOB_NAME}/libdss_capi.so "release/dss_matlab/+DSS_MATLAB/dss_capi.so"
20+
- mv dss_capi/lib/${TRAVIS_JOB_NAME}/libdss_capid.so "release/dss_matlab/+DSS_MATLAB/dss_capid.so"
2121
- mv dss_capi/lib/${TRAVIS_JOB_NAME}/libklusolve.so "release/dss_matlab/+DSS_MATLAB/"
2222
- mv dss_capi/KLUSOLVE_LICENSE "release/dss_matlab/"
2323
- mv dss_capi/OPENDSS_LICENSE "release/dss_matlab/"
@@ -26,8 +26,8 @@ matrix:
2626
- mv README.md release/dss_matlab/
2727
- mv examples release/dss_matlab/
2828
- cd "release/dss_matlab/+DSS_MATLAB"
29-
- patchelf --set-rpath '$ORIGIN/.' dss_capi_v7.so
30-
- patchelf --set-rpath '$ORIGIN/.' dss_capi_v7d.so
29+
- patchelf --set-rpath '$ORIGIN/.' dss_capi.so
30+
- patchelf --set-rpath '$ORIGIN/.' dss_capid.so
3131
- cd ../..
3232
- tar zcf dss_matlab_v${DSS_MATLAB_VERSION}_${TRAVIS_JOB_NAME}.tar.gz dss_matlab
3333
- rm -rf dss_matlab
@@ -62,8 +62,8 @@ matrix:
6262
- tar zxf dss_capi.tar.gz
6363
- mkdir -p release/dss_matlab
6464
- cp -R "+DSS_MATLAB" "release/dss_matlab/+DSS_MATLAB"
65-
- mv dss_capi/lib/${TRAVIS_JOB_NAME}/libdss_capi_v7.dylib "release/dss_matlab/+DSS_MATLAB/dss_capi_v7.dylib"
66-
- mv dss_capi/lib/${TRAVIS_JOB_NAME}/libdss_capi_v7d.dylib "release/dss_matlab/+DSS_MATLAB/dss_capi_v7d.dylib"
65+
- mv dss_capi/lib/${TRAVIS_JOB_NAME}/libdss_capi.dylib "release/dss_matlab/+DSS_MATLAB/dss_capi.dylib"
66+
- mv dss_capi/lib/${TRAVIS_JOB_NAME}/libdss_capid.dylib "release/dss_matlab/+DSS_MATLAB/dss_capid.dylib"
6767
- mv dss_capi/lib/${TRAVIS_JOB_NAME}/libklusolve.dylib "release/dss_matlab/+DSS_MATLAB/"
6868
- mv dss_capi/KLUSOLVE_LICENSE "release/dss_matlab/"
6969
- mv dss_capi/OPENDSS_LICENSE "release/dss_matlab/"

0 commit comments

Comments
 (0)