Changeset 10082

Timestamp:

10/24/13 10:14:02 (11 years ago)

Author:

ascheibe

Message:

#1886 correction of LPHull Func

File:

• branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/LPHull.cs (modified) (3 diffs)

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/LPHull.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
-using HeuristicLab.Common;
 
 namespace HeuristicLab.Analysis.AlgorithmBehavior.Analyzers {
@@ -118 +117 @@
 
       for (int i = 0; i < K; i++) {
-        init[i] = 1.0 / K;
+        init[i] = 0.0;
         lowerBound[i] = 0.0;
         upperBound[i] = double.MaxValue;
       }
+      init[aIdx] = 1.0;
 
       //last column gets b
@@ -143 +143 @@
       alglib.minbleicsetlc(state, c, ct);
       alglib.minbleicsetcond(state, 0.0, 0.0, 0.0, 0);
-      alglib.minbleicoptimize(state, Func, null, new Tuple<List<double[]>, double[], int>(A, alpha, aIdx));
+      alglib.minbleicoptimize(state, Func, null, aIdx);
       alglib.minbleicresults(state, out x, out rep);
 
-      return x.Count(y => y.IsAlmost(1.0)) == 1;
+      if (rep.terminationtype < 0) throw new ArgumentException("minbleic terminated with error");
+      if (rep.terminationtype == 5) Console.WriteLine("max number of iterations reached in minbleic");
+      return x[aIdx] >= 1.0;
     }
 
     private static void Func(double[] x, ref double func, double[] grad, object obj) {
-      Tuple<List<double[]>, double[], int> data = obj as Tuple<List<double[]>, double[], int>;
-      int aIdx = data.Item3;
-      double[] alpha = data.Item2;
-      List<double[]> A = data.Item1;
+      int aIdx = (int)obj;
 
-      //well, this seems to work but is probably not correct
+      func = x[aIdx];
       for (int i = 0; i < grad.Length; i++) {
         grad[i] = 0;
       }
       grad[aIdx] = 1;
-
-      func = 0.0;
-      for (int i = 0; i < A.Count; i++) {
-        for (int j = 0; j < A[i].Length; j++) {
-          func += A[i][j] * x[i];
-        }
-      }
     }
   }