Changeset 10595

Timestamp:

03/16/14 16:07:44 (11 years ago)

Author:

mkommend

Message:

#2082: Implemented reviewer comments for the Scilab parameter optimization problem & evaluator.

Location:

branches/HeuristicLab.ExternalEvaluation Scientific/HeuristicLab.Problems.ExternalEvaluation.Scilab/3.3

Files:

• ScilabParameterOptimizationProblem.cs (modified) (4 diffs)
• ScilabParameterVectorEvaluator.cs (modified) (5 diffs)

branches/HeuristicLab.ExternalEvaluation Scientific/HeuristicLab.Problems.ExternalEvaluation.Scilab/3.3/ScilabParameterOptimizationProblem.cs

@@ -34 +34 @@
     private const string QualityVariableParameterName = "QualityVariableName";
     private const string ScilabEvaluationScriptParameterName = "ScilabEvaluationScript";
+    private const string ScilabInitializationScriptParameterName = "ScilabInitializationScript";
 
     #region parameters
@@ -41 +42 @@
     public IFixedValueParameter<TextFileValue> ScilabEvaluationScriptParameter {
       get { return (IFixedValueParameter<TextFileValue>)Parameters[ScilabEvaluationScriptParameterName]; }
+    }
+    public IFixedValueParameter<TextFileValue> ScilabInitializationScriptParameter {
+      get { return (IFixedValueParameter<TextFileValue>)Parameters[ScilabInitializationScriptParameterName]; }
     }
     #endregion
@@ -52 +56 @@
       get { return ScilabEvaluationScriptParameter.Value; }
     }
+    public TextFileValue ScilabInitializationScript {
+      get { return ScilabInitializationScriptParameter.Value; }
+    }
+
     #endregion
 
@@ -67 +75 @@
       Parameters.Add(new FixedValueParameter<StringValue>(QualityVariableParameterName, "The name of the quality variable of the Scilab script.", new StringValue("quality")));
       Parameters.Add(new FixedValueParameter<TextFileValue>(ScilabEvaluationScriptParameterName, "The path to the Scilab evaluation script.", new TextFileValue()));
+      Parameters.Add(new FixedValueParameter<TextFileValue>(ScilabInitializationScriptParameterName, "The path to a Scilab script the should be execute before the evaluation starts.", new TextFileValue()));
 
       ScilabEvaluationScript.FileDialogFilter = @"Scilab Scripts|*.sce|All files|*.*";
+      ScilabInitializationScript.FileDialogFilter = @"Scilab Scripts|*.sce|All files|*.*";
     }
   }

branches/HeuristicLab.ExternalEvaluation Scientific/HeuristicLab.Problems.ExternalEvaluation.Scilab/3.3/ScilabParameterVectorEvaluator.cs

@@ -36 +36 @@
     private const string QualityVariableParameterName = "QualityVariableName";
     private const string ScilabEvaluationScriptParameterName = "ScilabEvaluationScript";
-    private const string InitializationScriptParameterName = "InitializationScript";
+    private const string ScilabInitializationScriptParameterName = "ScilabInitializationScript";
 
     #region parameters
@@ -45 +45 @@
       get { return (ILookupParameter<TextFileValue>)Parameters[ScilabEvaluationScriptParameterName]; }
     }
-    public IFixedValueParameter<TextFileValue> InitializationScriptParameter {
-      get { return (IFixedValueParameter<TextFileValue>)Parameters[InitializationScriptParameterName]; }
+    public ILookupParameter<TextFileValue> ScilabInitializationScriptParameter {
+      get { return (ILookupParameter<TextFileValue>)Parameters[ScilabInitializationScriptParameterName]; }
     }
     #endregion
-
-    public TextFileValue InitializationScript {
-      get { return InitializationScriptParameter.Value; }
-    }
 
     [StorableConstructor]
@@ -67 +63 @@
       Parameters.Add(new LookupParameter<StringValue>(QualityVariableParameterName, "The name of the quality variable of the Scilab script."));
       Parameters.Add(new LookupParameter<TextFileValue>(ScilabEvaluationScriptParameterName, "The path to the Scilab evaluation script."));
-      Parameters.Add(new FixedValueParameter<TextFileValue>(InitializationScriptParameterName, "The path to a Scilab script the should be execute before the evaluation starts.", new TextFileValue()));
-
-      InitializationScript.FileDialogFilter = @"Scilab Scripts|*.sce|All files|*.*";
-    }
-
-    //[StorableHook(HookType.AfterDeserialization)]
-    //private void AfterDeserialization() {
-    //  InitializeState();
-    //}
-
-    public override void InitializeState() {
-      base.InitializeState();
-
-      if (string.IsNullOrEmpty(InitializationScript.Value)) return;
-      if (!InitializationScript.Exists()) throw new FileNotFoundException(string.Format("The initialization script \"{0}\" cannot be found.", InitializationScript.Value));
-      int result = DotNetScilab.Scilab.Instance.execScilabScript(InitializationScript.Value);
-      if (result != 0) ThrowSciLabException(InitializationScript.Value, result);
+      Parameters.Add(new LookupParameter<TextFileValue>(ScilabInitializationScriptParameterName, "The path to a Scilab script the should be execute before the evaluation starts."));
     }
 
     private readonly object locker = new object();
+    private static DotNetScilab.Scilab scilab = null;
+    private bool startedScilab = false;
+
     public override IOperation Apply() {
       var evaluationScript = ScilabEvaluationScriptParameter.ActualValue;
@@ -92 +75 @@
       if (!evaluationScript.Exists()) throw new FileNotFoundException(string.Format("The evaluation script \"{0}\" cannot be found.", evaluationScript.Value));
 
+      var initializationScript = ScilabInitializationScriptParameter.ActualValue;
+      if (!string.IsNullOrEmpty(initializationScript.Value) && !initializationScript.Exists()) throw new FileNotFoundException(string.Format("The initialization script \"{0}\" cannot be found.", initializationScript.Value));
+
+      int result;
       //Scilab is used via a c++ wrapper that calls static methods. Hence it is not possible to parallelize the evaluation.
       lock (locker) {
-        int result;
+        //initialize scilab and execute initialization script
+        if (scilab == null) {
+          startedScilab = true;
+          scilab = new DotNetScilab.Scilab(false);
+          if (!string.IsNullOrEmpty(initializationScript.Value)) {
+            result = DotNetScilab.Scilab.Instance.execScilabScript(initializationScript.Value);
+            if (result != 0) ThrowSciLabException(initializationScript.Value, result);
+          }
+        } else if (!startedScilab) {
+          throw new InvalidOperationException("Could not run multiple optimization algorithms in parallel.");
+        }
+
         var parameterVector = ParameterVectorParameter.ActualValue;
         var parameterNames = ParameterNamesParameter.ActualValue;
         if (parameterNames.Any(string.IsNullOrEmpty)) throw new ArgumentException("Not all parameter names are provided.");
-        var scilab = DotNetScilab.Scilab.Instance;
 
         for (int i = 0; i < ProblemSizeParameter.ActualValue.Value; i++) {
           result = scilab.createNamedMatrixOfDouble(parameterNames[i], 1, 1, new double[] { parameterVector[i] });
-          //if (result != 0) throw new InvalidOperationException("Error while setting the parameter " + parameterNames[i] + " to " + parameterVector[i] + "  (ErrorCode: " + result + ").");
           if (result != 0) ThrowSciLabException("setting parameter " + parameterNames[i], result);
         }
@@ -123 +119 @@
     }
 
+    public override void ClearState() {
+      base.ClearState();
+      if (startedScilab)
+        scilab = null;
+      startedScilab = false;
+    }
+
     private void ThrowSciLabException(string fileName, int errorCode) {
       const string code = "errorMsg = lasterror();";