Changeset 17997

Timestamp:

06/27/21 15:30:17 (3 years ago)

Author:

gkronber

Message:

#3127: merged r17992:17993 from trunk to branch

Location:

branches/3127-MRGP-VarPro-Exploration

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis.Glmnet/3.4/Glmnet.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/IntervalInterpreter.cs (modified) (3 diffs)

branches/3127-MRGP-VarPro-Exploration/HeuristicLab.Algorithms.DataAnalysis.Glmnet/3.4/Glmnet.cs

@@ -33 +33 @@
     ///  parm = penalty member index(0 <= parm <= 1)
     ///         = 0.0 => ridge
-    ///  = 1.0 => lasso
+    ///         = 1.0 => lasso
     ///    no = number of observations
     ///    ni = number of predictor variables
@@ -43 +43 @@
     ///  vp(ni) = relative penalties for each predictor variable
     ///       vp(j) = 0 => jth variable unpenalized
-    ///    cl(2, ni) = interval constraints on coefficient values(overwritten)
-    ///  cl(1, j) = lower bound for jth coefficient value(&lt;= 0.0)
-    ///  cl(2, j) = upper bound for jth coefficient value(>= 0.0)
+    ///  cl(2, ni) = interval constraints on coefficient values (overwritten)
+    ///    cl(1, j) = lower bound for jth coefficient value(<= 0.0)
+    ///    cl(2, j) = upper bound for jth coefficient value(>= 0.0)
     ///  ne = maximum number of variables allowed to enter largest model
-    /// (stopping criterion)
+    ///      (stopping criterion)
     ///  nx = maximum number of variables allowed to enter all models
-    ///  along path(memory allocation, nx > ne).
+    ///       along path(memory allocation, nx > ne).
     ///  nlam = (maximum)number of lamda values
     ///    flmin = user control of lamda values(>=0)

branches/3127-MRGP-VarPro-Exploration/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/IntervalInterpreter.cs

@@ -287 +287 @@
             var b = Evaluate(instructions, ref instructionCounter, nodeIntervals, variableIntervals);
             // support only integer powers
-            if(b.LowerBound == b.UpperBound && Math.Truncate(b.LowerBound) == b.LowerBound) {
+            if (b.LowerBound == b.UpperBound && Math.Truncate(b.LowerBound) == b.LowerBound) {
               result = Interval.Power(a, (int)b.LowerBound);
             } else {
@@ -321 +321 @@
 
     public static bool IsCompatible(ISymbolicExpressionTree tree) {
-      var containsUnknownSymbols = (
-        from n in tree.Root.GetSubtree(0).IterateNodesPrefix()
-        where
+      foreach (var n in tree.Root.GetSubtree(0).IterateNodesPrefix()) {
+        if (
           !(n.Symbol is Variable) &&
           !(n.Symbol is Constant) &&
@@ -343 +342 @@
           !(n.Symbol is Power) &&
           !(n.Symbol is Absolute) &&
-          !(n.Symbol is AnalyticQuotient)
-        select n).Any();
-      return !containsUnknownSymbols;
+          !(n.Symbol is AnalyticQuotient)) return false;
+
+        else if (n.Symbol is Power) {
+          // only integer exponents are supported
+          var exp = n.GetSubtree(1) as ConstantTreeNode;
+          if (exp == null || exp.Value != Math.Truncate(exp.Value)) return false;
+        }
+      }
+      return true;
     }
   }