Changeset 17779 for branches/3022-FastFunctionExtraction/FFX/Approach.cs

Timestamp:

10/29/20 15:24:40 (3 years ago)

Author:

gkronber

Message:

#3022: made a few changes while reviewing the code.

File:

• branches/3022-FastFunctionExtraction/FFX/Approach.cs (modified) (1 diff)

branches/3022-FastFunctionExtraction/FFX/Approach.cs

@@ -4 +4 @@
 namespace HeuristicLab.Algorithms.DataAnalysis.FastFunctionExtraction {
     internal struct Approach {
-        public bool AllowInter { get; set; }
-        public bool AllowDenom { get; set; }
+        public bool AllowInteractions { get; set; }
+        public bool AllowDenominators { get; set; }
         public bool AllowExp { get; set; }
-        public bool AllowNonlinFuncs { get; set; }
+        public bool AllowNonLinearFunctions { get; set; }
         public bool AllowHinge { get; set; }
         public HashSet<double> Exponents { get; set; }
-        public HashSet<NonlinearOperator> NonlinFuncs { get; set; }
-        public double MinHingeThr { get; set; }
-        public double MaxHingeThr { get; set; }
-        public int NumHingeThrs { get; set; }
-        public double ElnetPenalty { get; set; }
+        public HashSet<NonlinearOperator> NonLinearFunctions { get; set; }
+        public double MinHingeThreshold { get; set; }
+        public double MaxHingeThreshold { get; set; }
+        public int NumHingeThresholds { get; set; }
+        public double ElasticNetPenalty { get; set; }
         public int MaxNumBases { get; set; }
 
-        private static int Int(bool b) => b ? 1 : 0;
-
         public override string ToString() {
-            return $"Inter{Int(AllowInter)} Denom{Int(AllowDenom)} Exp{Int((AllowExp))} Nonlin{Int(AllowNonlinFuncs)} Hinge{Int(AllowHinge)}";
+            return $"Interactions{AllowInteractions} Denominator{AllowDenominators} Exponential{AllowExp} NonLinearFunctions{AllowNonLinearFunctions} HingeFunctions{AllowHinge}";
         }
 
-        public Approach(bool inter, bool denom, bool exp, bool nonlin, bool hinge, HashSet<double> exponents, HashSet<NonlinearOperator> nonlinFuncs, int maxNumBases, double penalty, double minHingeThr, double maxHingeThr, int numHingeThrs) {
-            this.AllowInter = inter;
-            this.AllowDenom = denom;
-            this.AllowExp = exp;
-            this.AllowNonlinFuncs = nonlin;
-            this.AllowHinge = hinge;
+        public Approach(bool allowInteractions, bool allowDenominators, bool allowExp, bool allowNonLinearFunctions, bool allowHingeFunctions, HashSet<double> exponents, HashSet<NonlinearOperator> nonLinearFunctions, int maxNumBases, double elasticNetPenality, double minHingeThreshold, double maxHingeThreshold, int numHingeThresholds) {
+            this.AllowInteractions = allowInteractions;
+            this.AllowDenominators = allowDenominators;
+            this.AllowExp = allowExp;
+            this.AllowNonLinearFunctions = allowNonLinearFunctions;
+            this.AllowHinge = allowHingeFunctions;
             if (AllowExp && exponents == null) throw new ArgumentNullException(nameof(exponents));
             Exponents = exponents;
-            if (AllowNonlinFuncs && nonlinFuncs == null) throw new ArgumentNullException(nameof(nonlinFuncs));
-            NonlinFuncs = nonlinFuncs;
-            MinHingeThr = minHingeThr;
-            MaxHingeThr = maxHingeThr;
-            NumHingeThrs = numHingeThrs;
-            ElnetPenalty = penalty;
+            if (AllowNonLinearFunctions && nonLinearFunctions == null) throw new ArgumentNullException(nameof(nonLinearFunctions));
+            NonLinearFunctions = nonLinearFunctions;
+            MinHingeThreshold = minHingeThreshold;
+            MaxHingeThreshold = maxHingeThreshold;
+            NumHingeThresholds = numHingeThresholds;
+            ElasticNetPenalty = elasticNetPenality;
             MaxNumBases = maxNumBases;
         }