Changeset 17878

Timestamp:

03/12/21 08:24:04 (4 years ago)

Author:

chaider

Message:

#3076 Removed unused code

Location:

branches/3076_IA_evaluators_analyzers/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4

Files:

• MultiObjective/SymbolicRegressionMultiObjectiveMultiSoftConstraintEvaluator.cs (modified) (1 diff)
• SingleObjective/Evaluators/SymbolicRegressionSingleObjectiveConstraintEvaluator.cs (modified) (4 diffs)

branches/3076_IA_evaluators_analyzers/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/SymbolicRegressionMultiObjectiveMultiSoftConstraintEvaluator.cs

@@ -177 +177 @@
         nmse = 1.0;
 
-
       var objectives = new List<double> {nmse};
-      ////var intervalInterpreter = new IntervalInterpreter() {UseIntervalSplitting = splitting};
-
-      //var constraintObjectives = new List<double>();
-      //foreach (var c in constraints) {
-      //  var penalty = ConstraintExceeded(c, intervalInterpreter, variableRanges,
-      //    solution);
-      //  var maxP = 0.1;
-
-      //  if (double.IsNaN(penalty) || double.IsInfinity(penalty) || penalty > maxP)
-      //    penalty = maxP;
-
-      //  constraintObjectives.Add(penalty);
-      //}
-
-      //objectives.AddRange(constraintObjectives);
-
-      //return objectives.ToArray();
-
       var results = IntervalUtil.IntervalConstraintsViolation(constraints, estimator, intervalCollection, solution);
       foreach (var result in results) {

branches/3076_IA_evaluators_analyzers/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionSingleObjectiveConstraintEvaluator.cs

@@ -16 +16 @@
   [Item("Constraints Evaluator", "Calculates NMSE of a symbolic regression solution with respect to constraints.")]
   [StorableType("27473973-DD8D-4375-997D-942E2280AE8E")]
-  class SymbolicRegressionSingleObjectiveConstraintEvaluator : SymbolicRegressionSingleObjectiveEvaluator {
+  public class SymbolicRegressionSingleObjectiveConstraintEvaluator : SymbolicRegressionSingleObjectiveEvaluator {
     #region Parameter/Properties
 
@@ -24 +24 @@
 
     private const string UseSoftConstraintsParameterName = "Use Soft Constraints Evaluation";
-
-    //private const string PenaltyMultiplierParameterName = "Constraints Penalty Multiplier";
 
     private const string BoundsEstimatorParameterName = "Bounds estimator";
@@ -40 +38 @@
     public IFixedValueParameter<BoolValue> UseSoftConstraintsParameter =>
       (IFixedValueParameter<BoolValue>)Parameters[UseSoftConstraintsParameterName];
-
-    //public IFixedValueParameter<DoubleValue> PenaltyMultiplierParameter =>
-      //(IFixedValueParameter<DoubleValue>)Parameters[PenaltyMultiplierParameterName];
 
     public IValueParameter<IBoundsEstimator> BoundsEstimatorParameter =>
@@ -122 +117 @@
           "Define whether the constraints are penalized by soft or hard constraints.", new BoolValue(false)));
       }
-
-      //if (!Parameters.ContainsKey(PenaltyMultiplierParameterName)) {
-      //  Parameters.Add(new FixedValueParameter<DoubleValue>(PenaltyMultiplierParameterName,
-      //    "Specify how hard constraints violations should be punished", new DoubleValue(1.0)));
-      //}
 
       if (!Parameters.ContainsKey(BoundsEstimatorParameterName))