Merge remote-tracking branch 'origin/master'

OpenModelica · May 22, 2015 · 6584fe1 · 6584fe1
2 parents 76f2202 + eb6f814
commit 6584fe1
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 41 deletions.
diff --git a/3rdParty b/3rdParty
diff --git a/Compiler/Script/CevalScript.mo b/Compiler/Script/CevalScript.mo
@@ -2847,9 +2847,7 @@ algorithm
     case (cache,_,"readSimulationResult",{Values.STRING(filename),Values.ARRAY(valueLst=cvars),Values.INTEGER(size)},st,_)
       equation
         vars_1 = List.map(cvars, ValuesUtil.printCodeVariableName);
-        pwd = System.pwd();
-        pd = System.pathDelimiter();
-        filename_1 = if System.strncmp("/",filename,1)==0 then filename else stringAppendList({pwd,pd,filename});
+        filename_1 = Util.absoluteOrRelative(filename);
         value = ValuesUtil.readDataset(filename_1, vars_1, size);
       then
         (cache,value,st);
@@ -2863,16 +2861,14 @@ algorithm
       equation
         pwd = System.pwd();
         pd = System.pathDelimiter();
-        filename_1 = if System.strncmp("/",filename,1)==0 then filename else stringAppendList({pwd,pd,filename});
+        filename_1 = Util.absoluteOrRelative(filename);
         i = SimulationResults.readSimulationResultSize(filename_1);
       then
         (cache,Values.INTEGER(i),st);
 
     case (cache,_,"readSimulationResultVars",{Values.STRING(filename),Values.BOOL(b1),Values.BOOL(b2)},st,_)
       equation
-        pwd = System.pwd();
-        pd = System.pathDelimiter();
-        filename_1 = if System.strncmp("/",filename,1)==0 then filename else stringAppendList({pwd,pd,filename});
+        filename_1 = Util.absoluteOrRelative(filename);
         args = SimulationResults.readVariables(filename_1, b1, b2);
         vals = List.map(args, ValuesUtil.makeString);
         v = ValuesUtil.makeArray(vals);
@@ -2881,12 +2877,10 @@ algorithm
 
     case (cache,_,"compareSimulationResults",{Values.STRING(filename),Values.STRING(filename_1),Values.STRING(filename2),Values.REAL(x1),Values.REAL(x2),Values.ARRAY(valueLst=cvars)},st,_)
       equation
-        pwd = System.pwd();
-        pd = System.pathDelimiter();
-        filename = if System.substring(filename,1,1) == "/" then filename else stringAppendList({pwd,pd,filename});
+        filename = Util.absoluteOrRelative(filename);
         filename_1 = Util.testsuiteFriendlyPath(filename_1);
-        filename_1 = if System.substring(filename_1,1,1) == "/" then filename_1 else stringAppendList({pwd,pd,filename_1});
-        filename2 = if System.substring(filename2,1,1) == "/" then filename2 else stringAppendList({pwd,pd,filename2});
+        filename_1 = Util.absoluteOrRelative(filename_1);
+        filename2 = Util.absoluteOrRelative(filename2);
         vars_1 = List.map(cvars, ValuesUtil.extractValueString);
         strings = SimulationResults.cmpSimulationResults(Config.getRunningTestsuite(),filename,filename_1,filename2,x1,x2,vars_1);
         cvars = List.map(strings,ValuesUtil.makeString);
@@ -2911,10 +2905,10 @@ algorithm
       equation
         pwd = System.pwd();
         pd = System.pathDelimiter();
-        filename = if System.substring(filename,1,1) == "/" then filename else stringAppendList({pwd,pd,filename});
+        filename = Util.absoluteOrRelative(filename);
         filename_1 = Util.testsuiteFriendlyPath(filename_1);
-        filename_1 = if System.substring(filename_1,1,1) == "/" then filename_1 else stringAppendList({pwd,pd,filename_1});
-        filename2 = if System.substring(filename2,1,1) == "/" then filename2 else stringAppendList({pwd,pd,filename2});
+        filename_1 = Util.absoluteOrRelative(filename_1);
+        filename2 = Util.absoluteOrRelative(filename2);
         vars_1 = List.map(cvars, ValuesUtil.extractValueString);
         (b,strings) = SimulationResults.diffSimulationResults(Config.getRunningTestsuite(),filename,filename_1,filename2,reltol,reltolDiffMinMax,rangeDelta,vars_1,b);
         cvars = List.map(strings,ValuesUtil.makeString);
@@ -2929,11 +2923,9 @@ algorithm
 
     case (cache,_,"diffSimulationResultsHtml",{Values.STRING(str),Values.STRING(filename),Values.STRING(filename_1),Values.REAL(reltol),Values.REAL(reltolDiffMinMax),Values.REAL(rangeDelta)},st,_)
       equation
-        pwd = System.pwd();
-        pd = System.pathDelimiter();
-        filename = if System.substring(filename,1,1) == "/" then filename else stringAppendList({pwd,pd,filename});
+        filename = Util.absoluteOrRelative(filename);
         filename_1 = Util.testsuiteFriendlyPath(filename_1);
-        filename_1 = if System.substring(filename_1,1,1) == "/" then filename_1 else stringAppendList({pwd,pd,filename_1});
+        filename_1 = Util.absoluteOrRelative(filename_1);
         str = SimulationResults.diffSimulationResultsHtml(Config.getRunningTestsuite(),filename,filename_1,reltol,reltolDiffMinMax,rangeDelta,str);
       then
         (cache,Values.STRING(str),st);

diff --git a/Compiler/Util/Util.mo b/Compiler/Util/Util.mo
@@ -1751,5 +1751,20 @@ public function anyReturnTrue<T>
   output Boolean b = true;
 end anyReturnTrue;
 
+public function absoluteOrRelative
+"@author: adrpo
+ returns the given path if it exists if not it considers it relative and returns that"
+ input String inFileName;
+ output String outFileName;
+protected
+ String pwd, pd;
+algorithm
+ pwd := System.pwd();
+ pd := System.pathDelimiter();
+ outFileName := if System.regularFileExists(inFileName)
+                then inFileName
+                else stringAppendList({pwd,pd,inFileName});
+end absoluteOrRelative;
+
 annotation(__OpenModelica_Interface="util");
 end Util;
diff --git a/SimulationRuntime/cpp/Include/Core/SimController/ISimController.h b/SimulationRuntime/cpp/Include/Core/SimController/ISimController.h
@@ -34,37 +34,33 @@ struct SimSettings
   LogType logType;
 };
 
-/*SimController to start and stop the simulation*/
+/**
+ *  SimController to start and stop the simulation
+ */
 class ISimController
 {
 
 public:
-  /// Enumeration to control the time integration
+
   virtual ~ISimController() {};
-/*
-#if defined(__vxworks) || defined(__TRICORE__)
-#else
-  virtual std::pair<boost::shared_ptr<IMixedSystem>,boost::shared_ptr<ISimData> > LoadSystem(boost::shared_ptr<ISimData> (*createSimDataCallback)(), boost::shared_ptr<IMixedSystem> (*createSystemCallback)(IGlobalSettings*, boost::shared_ptr<IAlgLoopSolverFactory>, boost::shared_ptr<ISimData>), string modelKey)=0;
-#endif
-*/
   virtual boost::weak_ptr<IMixedSystem> LoadSystem(string modelLib,string modelKey) = 0;
   virtual boost::weak_ptr<IMixedSystem> LoadModelicaSystem(PATH modelica_path,string modelKey) = 0;
   virtual boost::weak_ptr<ISimData> LoadSimData(string modelKey) = 0;
-  /*
+  /**
   Creates  SimVars object, stores all model variable in continuous block of memory
-     @modelKey  model name
-     @dim_real  number of all real variables (real algebraic vars,discrete algebraic vars, state vars, der state vars)
-     @dim_int   number of all integer variables integer algebraic vars
-     @dim_bool  number of all bool variables (boolean algebraic vars)
-     @dim_pre_vars number of all pre variables (real algebraic vars,discrete algebraic vars, boolean algebraic vars, integer algebraic vars, state vars, der state vars)
-     @dim_z number of all state variables
-     @z_i start index of state vector in real_vars list
+     @param  model name
+     @param dim_real  number of all real variables (real algebraic vars,discrete algebraic vars, state vars, der state vars)
+     @param dim_int   number of all integer variables integer algebraic vars
+     @param dim_bool  number of all bool variables (boolean algebraic vars)
+     @param dim_pre_vars number of all pre variables (real algebraic vars,discrete algebraic vars, boolean algebraic vars, integer algebraic vars, state vars, der state vars)
+     @param dim_z number of all state variables
+     @param z_i start index of state vector in real_vars list
      */
   virtual boost::weak_ptr<ISimVars> LoadSimVars(string modelKey,size_t dim_real,size_t dim_int,size_t dim_bool,size_t dim_pre_vars,size_t dim_z,size_t z_i) = 0;
-  /*
+  /**
   Starts the simulation
-  modelKey: Modelica model name
-  modelica_path: path to Modelica system dll
+  @param modelKey Modelica model name
+  @param modelica_path: path to Modelica system dll
   */
   virtual void Start(SimSettings simsettings, string modelKey)=0;
 
@@ -74,7 +70,9 @@ class ISimController
   virtual boost::weak_ptr<IMixedSystem> getSystem(string modelname) = 0;
   virtual void calcOneStep() = 0;
 
-  /// Stops the simulation
+  /**
+   *    Stops the simulation
+   */
   virtual void Stop() = 0;
 };
 /** @} */ // end of coreSimcontroller
diff --git a/common b/common