From 6aafad377bb4354d7689c3eb6db67f5488528e8d Mon Sep 17 00:00:00 2001
From: Cristian Galperti <cristian.galperti@epfl.ch>
Date: Tue, 18 Jun 2019 08:36:11 +0200
Subject: [PATCH] MARTe2 cfg file with correct class names
---
code/classes/SCDclass_mdsobjcontainer.m | 4 ++--
code/classes/SCDclass_mdspar.m | 8 ++++++--
code/classes/SCDclass_mdspar3Dmatrix.m | 1 +
code/classes/SCDclass_mdsparfixdimvector.m | 1 +
code/classes/SCDclass_mdsparfixdimvectoridx.m | 1 +
code/classes/SCDclass_mdsparfixdimvectorint.m | 1 +
code/classes/SCDclass_mdsparmatrix.m | 1 +
code/classes/SCDclass_mdsparscalar.m | 1 +
code/classes/SCDclass_mdsparscalarint.m | 1 +
code/classes/SCDclass_mdsparvector.m | 1 +
10 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/code/classes/SCDclass_mdsobjcontainer.m b/code/classes/SCDclass_mdsobjcontainer.m
index ee77709..1f6dc24 100644
--- a/code/classes/SCDclass_mdsobjcontainer.m
+++ b/code/classes/SCDclass_mdsobjcontainer.m
@@ -250,9 +250,9 @@ classdef SCDclass_mdsobjcontainer
prevServer = ''; % init
% Header for MDS for loader
- loaderStr = sprintf('\n\n+MDSLoader = {\n Class=SPCMDSLoader \n Shot=%d\n',shot);
+ loaderStr = sprintf('\n\n+MDSParameters = {\n Class=MDSObjLoader \n Shot=%d\n',shot);
fprintf("%s",loaderStr);
-
+
for ii=1:obj.numparams
mymdsparam = obj.mdsparams(iorder(ii));
diff --git a/code/classes/SCDclass_mdspar.m b/code/classes/SCDclass_mdspar.m
index 67bbeac..5235f76 100644
--- a/code/classes/SCDclass_mdspar.m
+++ b/code/classes/SCDclass_mdspar.m
@@ -19,6 +19,7 @@ classdef SCDclass_mdspar < matlab.mixin.Heterogeneous
modelname % name of the Simulink model using the parameter
getcommand % full command for getting the value (callable by matlab eval)
classname % class name for logging
+ marteclassname % class name for generating MARTe2 cfg file
cparser % constructor parameters parser
assignvar % actualizedata specific
@@ -179,15 +180,18 @@ classdef SCDclass_mdspar < matlab.mixin.Heterogeneous
function entrystring = genMARTe2entrycommon(obj, shot)
obj=obj.actualizetdiexpr(shot);
- entrystring = sprintf('+%-50s = { Class=%-30s Path=%-40s',obj.gettargetparam,obj.classname,obj.tdiexprused);
+ entrystring = sprintf('+%-50s = { Class=%-30s Path=%-40s',obj.gettargetparam,obj.marteclassname,obj.tdiexprused);
end
function str = genMARTe2MDSsourcestr(obj)
- str = sprintf(' +MDSSource = {\n Class=SPCMDSSource\n Server=%s\n Tree=%s',obj.mdsserver,obj.mdstree);
+ %str = sprintf(' +MDSSource = {\n Class=SPCMDSSource\n Server=%s\n Tree=%s',obj.mdsserver,obj.mdstree);
+ str = sprintf(' +Connection_%s = {\n Class=MDSObjConnection\n Tree=%s',obj.mdsserver,obj.mdstree);
+
end
end
+
% Abstract method actually implemented by child classes
methods (Abstract)
diff --git a/code/classes/SCDclass_mdspar3Dmatrix.m b/code/classes/SCDclass_mdspar3Dmatrix.m
index 693520e..bc8b2ce 100644
--- a/code/classes/SCDclass_mdspar3Dmatrix.m
+++ b/code/classes/SCDclass_mdspar3Dmatrix.m
@@ -12,6 +12,7 @@ classdef SCDclass_mdspar3Dmatrix < SCDclass_mdspar
obj=obj.parseconstructorcommon(srctdimodel, destparam, varargin);
% Constructor parser customization results here
obj.classname=mfilename;
+ obj.marteclassname='MDSPar3DMatrix';
end
function actualizedata(obj, shot)
diff --git a/code/classes/SCDclass_mdsparfixdimvector.m b/code/classes/SCDclass_mdsparfixdimvector.m
index a4739a6..aa3518a 100644
--- a/code/classes/SCDclass_mdsparfixdimvector.m
+++ b/code/classes/SCDclass_mdsparfixdimvector.m
@@ -16,6 +16,7 @@ classdef SCDclass_mdsparfixdimvector < SCDclass_mdspar
% Constructor parser customization results here
obj.dimension=destdimension;
obj.classname=mfilename;
+ obj.marteclassname='MDSParFixDimVector';
end
function actualizedata(obj, shot)
diff --git a/code/classes/SCDclass_mdsparfixdimvectoridx.m b/code/classes/SCDclass_mdsparfixdimvectoridx.m
index 47479db..f6dd7bb 100644
--- a/code/classes/SCDclass_mdsparfixdimvectoridx.m
+++ b/code/classes/SCDclass_mdsparfixdimvectoridx.m
@@ -21,6 +21,7 @@ classdef SCDclass_mdsparfixdimvectoridx < SCDclass_mdspar
obj.idxstart=srcinterval(1);
obj.idxstop=srcinterval(end);
obj.classname=mfilename;
+ obj.marteclassname='MDSParFixDimVectorIdx';
end
function actualizedata(obj, shot)
diff --git a/code/classes/SCDclass_mdsparfixdimvectorint.m b/code/classes/SCDclass_mdsparfixdimvectorint.m
index 3085ef1..197d4d4 100644
--- a/code/classes/SCDclass_mdsparfixdimvectorint.m
+++ b/code/classes/SCDclass_mdsparfixdimvectorint.m
@@ -17,6 +17,7 @@ classdef SCDclass_mdsparfixdimvectorint < SCDclass_mdspar
% Constructor parser customization results here
obj.classname=mfilename;
obj.dimension=destdimension;
+ obj.marteclassname='MDSParFixDimVectorInt';
end
function actualizedata(obj, shot)
diff --git a/code/classes/SCDclass_mdsparmatrix.m b/code/classes/SCDclass_mdsparmatrix.m
index 686ab6e..63b9c40 100644
--- a/code/classes/SCDclass_mdsparmatrix.m
+++ b/code/classes/SCDclass_mdsparmatrix.m
@@ -12,6 +12,7 @@ classdef SCDclass_mdsparmatrix < SCDclass_mdspar
obj=obj.parseconstructorcommon(srctdimodel, destparam, varargin);
% Constructor parser customization results here
obj.classname=mfilename;
+ obj.marteclassname='MDSParMatrix';
end
function actualizedata(obj, shot)
diff --git a/code/classes/SCDclass_mdsparscalar.m b/code/classes/SCDclass_mdsparscalar.m
index 360d0da..bc59931 100644
--- a/code/classes/SCDclass_mdsparscalar.m
+++ b/code/classes/SCDclass_mdsparscalar.m
@@ -12,6 +12,7 @@ classdef SCDclass_mdsparscalar < SCDclass_mdspar
obj=obj.parseconstructorcommon(srctdimodel, destparam, varargin);
% Constructor parser customization results here
obj.classname=mfilename;
+ obj.marteclassname='MDSParScalar';
end
function actualizedata(obj, shot)
diff --git a/code/classes/SCDclass_mdsparscalarint.m b/code/classes/SCDclass_mdsparscalarint.m
index 67c5816..af6ac78 100644
--- a/code/classes/SCDclass_mdsparscalarint.m
+++ b/code/classes/SCDclass_mdsparscalarint.m
@@ -11,6 +11,7 @@ classdef SCDclass_mdsparscalarint < SCDclass_mdspar
obj=obj.parseconstructorcommon(srctdimodel, destparam, varargin);
% Constructor parser customization results here
obj.classname=mfilename;
+ obj.marteclassname='MDSParScalarInt';
end
function actualizedata(obj, shot)
diff --git a/code/classes/SCDclass_mdsparvector.m b/code/classes/SCDclass_mdsparvector.m
index e99b276..8eed939 100644
--- a/code/classes/SCDclass_mdsparvector.m
+++ b/code/classes/SCDclass_mdsparvector.m
@@ -12,6 +12,7 @@ classdef SCDclass_mdsparvector < SCDclass_mdspar
obj=obj.parseconstructorcommon(srctdimodel, destparam, varargin);
% Constructor parser customization results here
obj.classname=mfilename;
+ obj.marteclassname='MDSParVector';
end
function actualizedata(obj, shot)
--
GitLab