Skip to content
Snippets Groups Projects
Commit da20cbe0 authored by Cristian Galperti's avatar Cristian Galperti Committed by Federico Felici
Browse files

getdatacommon -> getdata@superclass

parent eee23fce
No related branches found
No related tags found
No related merge requests found
Showing
with 21 additions and 26 deletions
......@@ -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)
......
......@@ -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
......
......@@ -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
......
......@@ -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)
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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)
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment