Changeset 5520

Timestamp:

02/19/11 11:15:50 (14 years ago)

Author:

gkronber

Message:

#1423 Fixed problem with progress reporting and stored quality values in a datatable.

Location:

branches/Algorithms.GradientDescent/HeuristicLab.Algorithms.GradientDescent/3.3

Files:

• HeuristicLab.Algorithms.GradientDescent.csproj (modified) (1 diff)
• LevenbergMarquardt.cs (modified) (1 diff)
• LevenbergMarquardtMove.cs (modified) (4 diffs)

branches/Algorithms.GradientDescent/HeuristicLab.Algorithms.GradientDescent/3.3/HeuristicLab.Algorithms.GradientDescent.csproj

@@ -108 +108 @@
       <HintPath>..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.ALGLIB-3.1.0.dll</HintPath>
     </Reference>
+    <Reference Include="HeuristicLab.Analysis-3.3">
+      <HintPath>..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Analysis-3.3.dll</HintPath>
+    </Reference>
     <Reference Include="HeuristicLab.Collections-3.3">
       <HintPath>..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>

branches/Algorithms.GradientDescent/HeuristicLab.Algorithms.GradientDescent/3.3/LevenbergMarquardt.cs

@@ -108 +108 @@
 
       subscopesProcessor.Operator = moveCreator;
-
-
-
-
     }
 

branches/Algorithms.GradientDescent/HeuristicLab.Algorithms.GradientDescent/3.3/LevenbergMarquardtMove.cs

@@ -30 +30 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.TestFunctions;
+using HeuristicLab.Analysis;
 
 namespace HeuristicLab.Algorithms.GradientDescent {
@@ -75 +76 @@
       double epsf = 0;
       double epsx = 0;
-      int maxits = 100;
+      int maxits = 0;
       double diffstep = .1;
 
@@ -82 +83 @@
       alglib.minlmstate state;
       alglib.minlmreport report;
-
-      alglib.minlmcreatev(solution.Length, 1, solution, diffstep, out state);
+      
+      alglib.minlmcreatev(solution.Length, solution, diffstep, out state);
       alglib.minlmsetcond(state, epsg, epsf, epsx, maxits);
-      alglib.minlmoptimize(state, CreateCallBack(EvaluatorParameter.ActualValue), ReportProgress, null);
+      alglib.minlmsetxrep(state, true);
+      alglib.minlmoptimize(state, CreateCallBack(EvaluatorParameter.ActualValue), CreateReportProgress(ResultParameter.ActualValue), null);
       alglib.minlmresults(state, out solution, out report);
 
@@ -104 +106 @@
     }
 
-    private void ReportProgress(double[] arg, double func, object obj) {
-      if (!ResultParameter.ActualValue.ContainsKey(QualityResultsName))
-        ResultParameter.ActualValue.Add(new Result(QualityResultsName, new DoubleValue()));
+    private alglib.ndimensional_rep CreateReportProgress(ResultCollection results) {
+      return (double[] arg, double func, object obj) => {
+        if (!results.ContainsKey(QualityResultsName)) {
+          DataTable table = new DataTable(QualityResultsName);
+          table.Rows.Add(new DataRow("Quality"));
+          results.Add(new Result(QualityResultsName, table));
+        }
 
-      ((DoubleValue)ResultParameter.ActualValue[QualityResultsName].Value).Value = func;
+        DataTable resultsTable = (DataTable)results[QualityResultsName].Value;
+        resultsTable.Rows["Quality"].Values.Add(func);
+      };
     }
   }