Changeset 9698

Timestamp:

07/05/13 12:37:42 (11 years ago)

Author:

mkommend

Message:

#2082: Improved error handling and correct matlab license file.

Location:

branches/HeuristicLab.ExternalEvaluation Scientific

Files:

• HeuristicLab.Problems.ExternalEvaluation.Matlab/3.3/HeuristicLab.Problems.ExternalEvaluation.Matlab-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.ExternalEvaluation.Matlab/3.3/MatlabParameterVectorEvaluator.cs (modified) (2 diffs)
• HeuristicLab.Problems.ExternalEvaluation.Scilab/3.3/ScilabParameterVectorEvaluator.cs (modified) (2 diffs)
• HeuristicLab.Problems.ParameterOptimization/3.3/ParameterOptimizationProblem.cs (modified) (4 diffs)

branches/HeuristicLab.ExternalEvaluation Scientific/HeuristicLab.Problems.ExternalEvaluation.Matlab/3.3/HeuristicLab.Problems.ExternalEvaluation.Matlab-3.3.csproj

@@ -163 +163 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Mathworks Interop License.txt" />
+    <Content Include="Mathworks Interop License.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

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

@@ -22 +22 @@
 using System;
 using System.IO;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -98 +99 @@
         var parameterVector = ParameterVectorParameter.ActualValue;
         var parameterNames = ParameterNamesParameter.ActualValue;
+        if (parameterNames.Any(string.IsNullOrEmpty)) throw new ArgumentException("Not all parameter names are provided.");
 
         for (int i = 0; i < ProblemSizeParameter.ActualValue.Value; i++) {

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

@@ -22 +22 @@
 using System;
 using System.IO;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -89 +90 @@
         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;
 

branches/HeuristicLab.ExternalEvaluation Scientific/HeuristicLab.Problems.ParameterOptimization/3.3/ParameterOptimizationProblem.cs

@@ -128 +128 @@
       Bounds.ToStringChanged += Bounds_ToStringChanged;
       ProblemSizeParameter.Value.ValueChanged += ProblemSize_Changed;
+      ParameterNames.Reset += ParameterNames_Reset;
     }
 
@@ -154 +155 @@
       UpdateStrategyVectorBounds();
     }
-    private void UpdateStrategyVectorBounds() {
+    protected virtual void UpdateStrategyVectorBounds() {
       DoubleMatrix strategyBounds = (DoubleMatrix)Bounds.Clone();
       for (int i = 0; i < strategyBounds.Rows; i++) {
@@ -163 +164 @@
     }
 
-    private void ProblemSize_Changed(object sender, EventArgs e) {
+    protected virtual void ProblemSize_Changed(object sender, EventArgs e) {
       if (ParameterNames.Length != ProblemSize)
         ((IStringConvertibleArray)ParameterNames).Length = ProblemSize;
@@ -170 +171 @@
       }
     }
+
+    protected virtual void ParameterNames_Reset(object sender, EventArgs e) {
+      ProblemSize = ParameterNames.Length;
+    }
   }
 }