Changeset 11033

Timestamp:

06/23/14 16:56:04 (10 years ago)

Author:

mkommend

Message:

#2082: Further bug fixes in the MATLAB evaluator.

File:

• branches/HeuristicLab.ExternalEvaluation Scientific/HeuristicLab.Problems.ExternalEvaluation.Matlab/3.3/MatlabParameterVectorEvaluator.cs (modified) (4 diffs)

branches/HeuristicLab.ExternalEvaluation Scientific/HeuristicLab.Problems.ExternalEvaluation.Matlab/3.3/MatlabParameterVectorEvaluator.cs

@@ -22 +22 @@
 using System;
 using System.IO;
+using System.Runtime.InteropServices;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -67 +68 @@
 
     public override void ClearState() {
-      matLabConnector.Execute("clear");
+      //mkommend: necessary because matlabConnector.Quit() does not work
+      try {
+        matLabConnector.Execute("exit");
+      }
+      catch (COMException) { }
+      finally {
+        matLabConnector = null;
+      }
+
       changedDirectory = false;
-      executedInitializationScript = false;
       base.ClearState();
     }
@@ -75 +83 @@
     private MLApp.MLApp matLabConnector;
     private bool changedDirectory = false;
-    private bool executedInitializationScript = false;
     private readonly object locker = new object();
 
     public override IOperation Apply() {
       lock (locker) {
-
-        if (matLabConnector == null) {
-          Type matlabtype = Type.GetTypeFromProgID("matlab.application.single");
-          matLabConnector = (MLApp.MLApp)Activator.CreateInstance(matlabtype);
-          matLabConnector.Visible = 0;
-        }
-        string result;
-
         var initializationScript = MatlabInitializationScriptParameter.ActualValue;
         if (!string.IsNullOrEmpty(initializationScript.Value) && !initializationScript.Exists())
@@ -98 +97 @@
           throw new FileNotFoundException(string.Format("The evaluation script \"{0}\" cannot be found.", evaluationScript.Value));
 
-        if (!string.IsNullOrEmpty(initializationScript.Value) && !executedInitializationScript) {
-          var directoryName = Path.GetDirectoryName(initializationScript.Value);
-          result = matLabConnector.Execute(string.Format("cd '{0}'", directoryName));
-          if (!string.IsNullOrEmpty(result)) throw new InvalidOperationException(result);
+        string result;
+        if (matLabConnector == null) {
+          Type matlabtype = Type.GetTypeFromProgID("matlab.application.single");
+          matLabConnector = (MLApp.MLApp)Activator.CreateInstance(matlabtype);
+          matLabConnector.Visible = 0;
 
-          result = matLabConnector.Execute(Path.GetFileNameWithoutExtension(initializationScript.Value));
-          if (!string.IsNullOrEmpty(result)) throw new InvalidOperationException(result);
+          if (!string.IsNullOrEmpty(initializationScript.Value)) {
+            var directoryName = Path.GetDirectoryName(initializationScript.Value);
+            if (string.IsNullOrEmpty(directoryName)) directoryName = Environment.CurrentDirectory;
+            result = matLabConnector.Execute(string.Format("cd '{0}'", directoryName));
+            if (!string.IsNullOrEmpty(result)) throw new InvalidOperationException(result);
 
-          executedInitializationScript = true;
+            result = matLabConnector.Execute(Path.GetFileNameWithoutExtension(initializationScript.Value));
+            if (!string.IsNullOrEmpty(result)) throw new InvalidOperationException(result);
+          }
         }
 
         if (!changedDirectory) {
           var directoryName = Path.GetDirectoryName(evaluationScript.Value);
+          if (string.IsNullOrEmpty(directoryName)) directoryName = Environment.CurrentDirectory;
           result = matLabConnector.Execute(string.Format("cd '{0}'", directoryName));
           if (!string.IsNullOrEmpty(result)) throw new InvalidOperationException(result);