From da20cbe0133a63174d0c800b219a05b536cf71da Mon Sep 17 00:00:00 2001
From: galperti <cristian.galperti@epfl.ch>
Date: Thu, 16 Jun 2022 10:46:09 +0200
Subject: [PATCH] getdatacommon -> getdata@superclass
---
classes/SCDclass_mdspar.m | 4 ++--
classes/SCDclass_mdspar3Dmatrix.m | 2 +-
classes/SCDclass_mdsparboolean.m | 2 +-
classes/SCDclass_mdsparenum.m | 2 +-
classes/SCDclass_mdsparfixdimvector.m | 2 +-
classes/SCDclass_mdsparfixdimvectorint.m | 2 +-
classes/SCDclass_mdsparmatrix.m | 2 +-
classes/SCDclass_mdsparmatrixbool.m | 2 +-
classes/SCDclass_mdsparmatrixdouble.m | 2 +-
classes/SCDclass_mdsparmatrixint.m | 2 +-
classes/SCDclass_mdsparnumeric.m | 7 +------
classes/SCDclass_mdsparscalar.m | 2 +-
classes/SCDclass_mdsparscalarbool.m | 2 +-
classes/SCDclass_mdsparscalardouble.m | 2 +-
classes/SCDclass_mdsparscalarint.m | 2 +-
classes/SCDclass_mdsparscalartaridx.m | 2 +-
classes/SCDclass_mdsparvector.m | 2 +-
classes/SCDclass_mdsparvectorbool.m | 2 +-
classes/SCDclass_mdsparvectordouble.m | 2 +-
classes/SCDclass_mdsparvectorint.m | 2 +-
20 files changed, 21 insertions(+), 26 deletions(-)
diff --git a/classes/SCDclass_mdspar.m b/classes/SCDclass_mdspar.m
index 108affe..27aaa07 100644
--- a/classes/SCDclass_mdspar.m
+++ b/classes/SCDclass_mdspar.m
@@ -171,7 +171,7 @@ classdef SCDclass_mdspar < matlab.mixin.Heterogeneous
end
end
- function [obj,value]=getdatacommon(obj, shot)
+ function [obj,value]=getdata(obj, shot)
% TODO: this depends upon selected MATLAB - MDSplus interface
% mdsipmex mdsvalueraw to return uncast MDSplus data
% python interface mdsvalue returns incast MDSplus data
@@ -386,7 +386,7 @@ classdef SCDclass_mdspar < matlab.mixin.Heterogeneous
% Gets data from mds, mds connection is assumed already estabilished
% and tree opened
- [obj, value] = getdata(obj, shot)
+ %[obj, value] = getdata(obj, shot)
% Generate C++ code
%gencode(obj)
diff --git a/classes/SCDclass_mdspar3Dmatrix.m b/classes/SCDclass_mdspar3Dmatrix.m
index 4c2c65f..10cd5a7 100644
--- a/classes/SCDclass_mdspar3Dmatrix.m
+++ b/classes/SCDclass_mdspar3Dmatrix.m
@@ -23,7 +23,7 @@ classdef SCDclass_mdspar3Dmatrix < SCDclass_mdspar
end
function [obj, value] = getdata(obj,shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
value=single(value);
end
diff --git a/classes/SCDclass_mdsparboolean.m b/classes/SCDclass_mdsparboolean.m
index 41276da..12a125a 100644
--- a/classes/SCDclass_mdsparboolean.m
+++ b/classes/SCDclass_mdsparboolean.m
@@ -22,7 +22,7 @@ classdef SCDclass_mdsparboolean < SCDclass_mdspar
end
function [obj, value] = getdata(obj, shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
value=int32(value);
end
diff --git a/classes/SCDclass_mdsparenum.m b/classes/SCDclass_mdsparenum.m
index 912159b..b9a2ed7 100644
--- a/classes/SCDclass_mdsparenum.m
+++ b/classes/SCDclass_mdsparenum.m
@@ -58,7 +58,7 @@ classdef SCDclass_mdsparenum < SCDclass_mdspar
end
function [obj, value] = getdata(obj, shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
end
function printinfo(obj)
diff --git a/classes/SCDclass_mdsparfixdimvector.m b/classes/SCDclass_mdsparfixdimvector.m
index 006a2f5..29ce714 100644
--- a/classes/SCDclass_mdsparfixdimvector.m
+++ b/classes/SCDclass_mdsparfixdimvector.m
@@ -40,7 +40,7 @@ classdef SCDclass_mdsparfixdimvector < SCDclass_mdspar
end
function [obj, value] = getdata(obj,shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
value=single(value);
end
diff --git a/classes/SCDclass_mdsparfixdimvectorint.m b/classes/SCDclass_mdsparfixdimvectorint.m
index 3872a7d..d730641 100644
--- a/classes/SCDclass_mdsparfixdimvectorint.m
+++ b/classes/SCDclass_mdsparfixdimvectorint.m
@@ -40,7 +40,7 @@ classdef SCDclass_mdsparfixdimvectorint < SCDclass_mdspar
end
function [obj, value] = getdata(obj,shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
value=int32(value);
end
diff --git a/classes/SCDclass_mdsparmatrix.m b/classes/SCDclass_mdsparmatrix.m
index 23feae0..f2bd8c1 100644
--- a/classes/SCDclass_mdsparmatrix.m
+++ b/classes/SCDclass_mdsparmatrix.m
@@ -23,7 +23,7 @@ classdef SCDclass_mdsparmatrix < SCDclass_mdspar
end
function [obj, value] = getdata(obj,shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
value=single(value);
end
diff --git a/classes/SCDclass_mdsparmatrixbool.m b/classes/SCDclass_mdsparmatrixbool.m
index eba15e3..3d28c09 100644
--- a/classes/SCDclass_mdsparmatrixbool.m
+++ b/classes/SCDclass_mdsparmatrixbool.m
@@ -23,7 +23,7 @@ classdef SCDclass_mdsparmatrixbool < SCDclass_mdspar
end
function [obj, value] = getdata(obj,shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
value=single(value);
end
diff --git a/classes/SCDclass_mdsparmatrixdouble.m b/classes/SCDclass_mdsparmatrixdouble.m
index 69adefd..6df494e 100644
--- a/classes/SCDclass_mdsparmatrixdouble.m
+++ b/classes/SCDclass_mdsparmatrixdouble.m
@@ -23,7 +23,7 @@ classdef SCDclass_mdsparmatrixdouble < SCDclass_mdspar
end
function [obj, value] = getdata(obj,shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
value=double(value);
end
diff --git a/classes/SCDclass_mdsparmatrixint.m b/classes/SCDclass_mdsparmatrixint.m
index ad8fb39..c08d02c 100644
--- a/classes/SCDclass_mdsparmatrixint.m
+++ b/classes/SCDclass_mdsparmatrixint.m
@@ -23,7 +23,7 @@ classdef SCDclass_mdsparmatrixint < SCDclass_mdspar
end
function [obj, value] = getdata(obj,shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
value=int32(value);
end
diff --git a/classes/SCDclass_mdsparnumeric.m b/classes/SCDclass_mdsparnumeric.m
index 7e621ae..6417c6d 100644
--- a/classes/SCDclass_mdsparnumeric.m
+++ b/classes/SCDclass_mdsparnumeric.m
@@ -28,7 +28,6 @@ classdef SCDclass_mdsparnumeric < SCDclass_mdspar
actchk=true;
if numel(sourcedim)~=numel(targetdim)
warning('SCDDScore:mdsparnumeric','%s: number of dimensions not matching, actualization skipped!',obj.modelparam);
- % TODO bette handle output ?
sourcedim
targetdim
actchk=false;
@@ -46,7 +45,6 @@ classdef SCDclass_mdsparnumeric < SCDclass_mdspar
end
if actchk && ~any(sourcedim == targetdim)
warning('SCDDScore:mdsparnumeric','%s: dimensions not matching, actualization skipped!',obj.modelparam);
- % TODO bette handle output ?
sourcedim
targetdim
actchk=false;
@@ -57,7 +55,6 @@ classdef SCDclass_mdsparnumeric < SCDclass_mdspar
targetclass=Simulink.data.evalinGlobal(obj.modelname,sprintf('class(%s)',obj.assignvar));
if actchk && ~strcmp(sourceclass,targetclass)
warning('SCDDScore:mdsparnumeric','%s: Data types not matching, actualization skipped!',obj.modelparam);
- % TODO bette handle output ?
sourceclass
targetclass
actchk=false;
@@ -67,8 +64,6 @@ classdef SCDclass_mdsparnumeric < SCDclass_mdspar
% interface do not provide in information (matrix
% orientation) to do this. Or, probably, I misunderstood and
% matrix orientation is always preserved
-
-
obj.caststring=sprintf('%s=%s;',obj.assignvar,obj.assignvar);
if actchk
@@ -77,7 +72,7 @@ classdef SCDclass_mdsparnumeric < SCDclass_mdspar
end
function [obj, value] = getdata(obj, shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
end
function printinfo(obj)
diff --git a/classes/SCDclass_mdsparscalar.m b/classes/SCDclass_mdsparscalar.m
index 2ee2a5b..fda44d6 100644
--- a/classes/SCDclass_mdsparscalar.m
+++ b/classes/SCDclass_mdsparscalar.m
@@ -24,7 +24,7 @@ classdef SCDclass_mdsparscalar < SCDclass_mdspar
end
function [obj, value] = getdata(obj, shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
value=single(value);
end
diff --git a/classes/SCDclass_mdsparscalarbool.m b/classes/SCDclass_mdsparscalarbool.m
index fa06c54..77603d0 100644
--- a/classes/SCDclass_mdsparscalarbool.m
+++ b/classes/SCDclass_mdsparscalarbool.m
@@ -22,7 +22,7 @@ classdef SCDclass_mdsparscalarbool < SCDclass_mdspar
end
function [obj, value] = getdata(obj, shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
value=uint8(value);
end
diff --git a/classes/SCDclass_mdsparscalardouble.m b/classes/SCDclass_mdsparscalardouble.m
index d9a04a7..00ef51d 100644
--- a/classes/SCDclass_mdsparscalardouble.m
+++ b/classes/SCDclass_mdsparscalardouble.m
@@ -24,7 +24,7 @@ classdef SCDclass_mdsparscalardouble < SCDclass_mdspar
end
function [obj, value] = getdata(obj, shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
value=double(value);
end
diff --git a/classes/SCDclass_mdsparscalarint.m b/classes/SCDclass_mdsparscalarint.m
index 71ef527..182ee33 100644
--- a/classes/SCDclass_mdsparscalarint.m
+++ b/classes/SCDclass_mdsparscalarint.m
@@ -22,7 +22,7 @@ classdef SCDclass_mdsparscalarint < SCDclass_mdspar
end
function [obj, value] = getdata(obj, shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
value=int32(value);
end
diff --git a/classes/SCDclass_mdsparscalartaridx.m b/classes/SCDclass_mdsparscalartaridx.m
index fd72d2a..1697546 100644
--- a/classes/SCDclass_mdsparscalartaridx.m
+++ b/classes/SCDclass_mdsparscalartaridx.m
@@ -26,7 +26,7 @@ classdef SCDclass_mdsparscalartaridx < SCDclass_mdspar
end
function [obj, value] = getdata(obj, shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
value=single(value);
end
diff --git a/classes/SCDclass_mdsparvector.m b/classes/SCDclass_mdsparvector.m
index ec15b41..0a177d8 100644
--- a/classes/SCDclass_mdsparvector.m
+++ b/classes/SCDclass_mdsparvector.m
@@ -23,7 +23,7 @@ classdef SCDclass_mdsparvector < SCDclass_mdspar
end
function [obj, value] = getdata(obj,shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
value=single(value);
end
diff --git a/classes/SCDclass_mdsparvectorbool.m b/classes/SCDclass_mdsparvectorbool.m
index 6c6dc8b..a82c746 100644
--- a/classes/SCDclass_mdsparvectorbool.m
+++ b/classes/SCDclass_mdsparvectorbool.m
@@ -22,7 +22,7 @@ classdef SCDclass_mdsparvectorbool < SCDclass_mdspar
end
function [obj, value] = getdata(obj, shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
value=uint8(value);
end
diff --git a/classes/SCDclass_mdsparvectordouble.m b/classes/SCDclass_mdsparvectordouble.m
index 2f32fc5..da74a9c 100644
--- a/classes/SCDclass_mdsparvectordouble.m
+++ b/classes/SCDclass_mdsparvectordouble.m
@@ -23,7 +23,7 @@ classdef SCDclass_mdsparvectordouble < SCDclass_mdspar
end
function [obj, value] = getdata(obj,shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
value=double(value);
end
diff --git a/classes/SCDclass_mdsparvectorint.m b/classes/SCDclass_mdsparvectorint.m
index e63b48b..80dee7e 100644
--- a/classes/SCDclass_mdsparvectorint.m
+++ b/classes/SCDclass_mdsparvectorint.m
@@ -23,7 +23,7 @@ classdef SCDclass_mdsparvectorint < SCDclass_mdspar
end
function [obj, value] = getdata(obj,shot)
- [obj,value]=obj.getdatacommon(shot);
+ [obj,value]=getdata@SCDclass_mdspar(obj,shot);
value=single(value);
end
--
GitLab