Changeset 17506

Timestamp:

04/10/20 14:04:59 (4 years ago)

Author:

mkommend

Message:

#2971: Further minor refactorings and renaming of members.

Location:

branches/2971_named_intervals

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionSingleObjectiveConstraintConstOptEvaluator.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionConstraintAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/IntervalConstraintView.cs (modified) (3 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/IntervalCollection.cs (modified) (5 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/IntervalConstraint.cs (modified) (7 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/ProblemDataConstraint.cs (modified) (1 diff)

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionSingleObjectiveConstraintConstOptEvaluator.cs

@@ -91 +91 @@
         if (constraint.Variable != null && !variableRanges.ContainsKey(constraint.Variable))
           throw new ArgumentException($"The given variable {constraint.Variable} in the constraint does not exists in the model.", nameof(IntervalConstraintsParser));
-        if (!constraint.IsDerivation) {
+        if (!constraint.IsDerivative) {
           var res = intervalInterpreter.GetSymbolicExpressionTreeInterval(solution, variableRanges);
           if (!constraint.Interval.Contains(res)) {
@@ -98 +98 @@
         } else {
           var tree = solution;
-          for (var i = 0; i < constraint.NumberOfDerivation; ++i) {
+          for (var i = 0; i < constraint.NumberOfDerivations; ++i) {
             tree = DerivativeCalculator.Derive(tree, constraint.Variable);
           }

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionConstraintAnalyzer.cs

@@ -105 +105 @@
       Interval resultInterval;
 
-      if (!constraint.IsDerivation) {
+      if (!constraint.IsDerivative) {
         resultInterval = intervalInterpreter.GetSymbolicExpressionTreeInterval(solution, variableRanges);
       } else {
         var tree = solution;
-        for (var i = 0; i < constraint.NumberOfDerivation; ++i) {
+        for (var i = 0; i < constraint.NumberOfDerivations; ++i) {
           tree = DerivativeCalculator.Derive(tree, constraint.Variable);
         }

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/IntervalConstraintView.cs

@@ -105 +105 @@
 
       variableInput.Text = Content.Variable;
-      if (!Content.IsDerivation) {
+      if (!Content.IsDerivative) {
         numberderivationInput.Enabled = false;
         numberderivationInput.SelectedItem = null;
@@ -113 +113 @@
         numberderivationInput.Visible = true;
         numberderivationInput.Enabled = true;
-        numberderivationInput.SelectedItem = Content.NumberOfDerivation;
+        numberderivationInput.SelectedItem = Content.NumberOfDerivations;
       }
 
@@ -178 +178 @@
     private void numberderivationInput_SelectedIndexChanged(object sender, EventArgs e) {
       if (numberderivationInput.SelectedItem == null) { 
-        Content.NumberOfDerivation = 0;
+        Content.NumberOfDerivations = 0;
         numberderivationInput.Enabled = false;
         return;
       }
       if ((int)numberderivationInput.SelectedItem == 1)
-        Content.NumberOfDerivation = 1;
+        Content.NumberOfDerivations = 1;
       else if ((int)numberderivationInput.SelectedItem == 2)
-        Content.NumberOfDerivation = 2;
+        Content.NumberOfDerivations = 2;
       else if ((int)numberderivationInput.SelectedItem == 3)
-        Content.NumberOfDerivation = 3;
+        Content.NumberOfDerivations = 3;
     }
 

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/IntervalCollection.cs

@@ -33 +33 @@
       get => HeuristicLab.Common.Resources.VSImageLibrary.Object;
     }
-    private IDictionary<string, Interval> VariableIntervals { get; } = new Dictionary<string, Interval>();
+    private IDictionary<string, Interval> intervals { get; } = new Dictionary<string, Interval>();
 
     [Storable(Name = "StorableIntervalInformation")]
@@ -39 +39 @@
       get {
         var l = new List<KeyValuePair<string, double[]>>();
-        foreach (var varInt in VariableIntervals)
+        foreach (var varInt in intervals)
 
           l.Add(new KeyValuePair<string, double[]>(varInt.Key,
@@ -48 +48 @@
       set {
         foreach (var varInt in value)
-          VariableIntervals.Add(varInt.Key, new Interval(varInt.Value[0], varInt.Value[1]));
+          intervals.Add(varInt.Key, new Interval(varInt.Value[0], varInt.Value[1]));
       }
     }
@@ -57 +57 @@
 
     protected IntervalCollection(IntervalCollection original, Cloner cloner) : base(original, cloner) {
-      foreach (var keyValuePair in original.VariableIntervals) {
-        VariableIntervals.Add(keyValuePair.Key, new Interval(keyValuePair.Value.LowerBound, keyValuePair.Value.UpperBound));
+      foreach (var keyValuePair in original.intervals) {
+        intervals.Add(keyValuePair.Key, new Interval(keyValuePair.Value.LowerBound, keyValuePair.Value.UpperBound));
       }
     }
@@ -65 +65 @@
     }
 
-    public IntervalCollection(IDictionary<string, Interval> variableIntervals) {
-      this.VariableIntervals = variableIntervals;
+    public IntervalCollection(IDictionary<string, Interval> intervals) {
+      this.intervals = intervals;
     }
 
-    public Interval GetInterval(string variable) {
-      if (!VariableIntervals.ContainsKey(variable)) throw new ArgumentException($"The given variable:{ variable } is not present!");
+    public Interval GetInterval(string identifier) {
+      if (!intervals.ContainsKey(identifier)) throw new ArgumentException($"The given identifier:{ identifier } is not present!");
 
-      return VariableIntervals[variable];
+      return intervals[identifier];
     }
 
-    public void SetInterval(string key, Interval interval) {
-      VariableIntervals[key] = interval;
+    public void SetInterval(string identifier, Interval interval) {
+      intervals[identifier] = interval;
     }
 
-    public void AddInterval(string key, Interval interval) {
-      VariableIntervals.Add(key, interval);
+    public void AddInterval(string identifier, Interval interval) {
+      intervals.Add(identifier, interval);
     }
 
-    public void DeleteInterval(string key) {
-      VariableIntervals.Remove(key);
+    public void DeleteInterval(string identifier) {
+      intervals.Remove(identifier);
     }
 
     public IDictionary<string, Interval> GetIntervals() {
-      return VariableIntervals;
+      return intervals;
     }
   }

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/IntervalConstraint.cs

@@ -20 +20 @@
 #endregion
 using System;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HEAL.Attic;
 
 namespace HeuristicLab.Problems.DataAnalysis {
@@ -60 +60 @@
     public string Target {
       get => target;
-      set {
+      private set {
         if (target == value) return;
         target = value;
@@ -68 +68 @@
     }
 
-    public bool IsDerivation {
-      get => numberOfDerivation > 0;
+    public bool IsDerivative {
+      get => NumberOfDerivations > 0;
     }
 
     [Storable]
-    private int numberOfDerivation;
-    public int NumberOfDerivation {
-      get => numberOfDerivation;
+    private int numberOfDerivations;
+    public int NumberOfDerivations {
+      get => numberOfDerivations;
       set {
         if (value < 0 || value > 3) throw new ArgumentException("Number of derivation has to be between 0 - 3.");
-        if (numberOfDerivation == value) return;
-        numberOfDerivation = value;
+        if (numberOfDerivations == value) return;
+        numberOfDerivations = value;
         UpdateExpression();
         OnChanged();
@@ -111 +111 @@
     private IntervalConstraint(StorableConstructorFlag _) : base(_) { }
 
-    public IntervalConstraint(string expression, string variable, string target, int numberOfDerivation, Interval interval, bool enabled) : base(){
+    public IntervalConstraint(string expression, string variable, string target, int numberOfDerivations, Interval interval, bool enabled) : base(){
       this.expression = expression;
       this.variable = variable;
       this.target = target;
-      this.numberOfDerivation = numberOfDerivation;
+      this.numberOfDerivations = numberOfDerivations;
       this.interval = interval;
       this.enabled = enabled;
@@ -129 +129 @@
       this.Variable = original.Variable;
       this.Target = original.Target;
-      this.NumberOfDerivation = original.NumberOfDerivation;
+      this.NumberOfDerivations = original.NumberOfDerivations;
       this.Interval = original.Interval;
       this.Enabled = original.Enabled;
@@ -157 +157 @@
       var expression = "";
 
-      if (!IsDerivation) {
+      if (!IsDerivative) {
         expression = string.Format("Target:{0} in {1}{2} .. {3}{4}",
           Variable,
@@ -174 +174 @@
         Interval?.UpperBound,
         "]",
-        GetDerivationString(numberOfDerivation));
+        GetDerivationString(numberOfDerivations));
         Expression = expression;
     }
 
     private string GetDefinitionString() {
-      if (!IsDerivation) {
+      if (!IsDerivative) {
         return "Target " + Variable;
       }
-      var definition = $"∂{GetDerivationString(numberOfDerivation)}Target/∂{Variable}{GetDerivationString(numberOfDerivation)}";
+      var definition = $"∂{GetDerivationString(numberOfDerivations)}Target/∂{Variable}{GetDerivationString(numberOfDerivations)}";
       return definition;
     }

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
-using HEAL.Attic;
 
 namespace HeuristicLab.Problems.DataAnalysis {
@@ -94 +94 @@
       problemData.Parameters.Add(new ConstrainedValueParameter<StringValue>(TargetVariableParameterName, new ItemSet<StringValue>()));
       problemData.Parameters.Add(new FixedValueParameter<IntervalCollection>(VariableRangesParameterName, "", new IntervalCollection()));
-      problemData.Parameters.Add(new FixedValueParameter<ProblemDataConstraint>(IntervalConstraintsParameterName, "", new ProblemDataConstraint()));
+      problemData.Parameters.Add(new FixedValueParameter<ProblemDataConstraint>(IntervalConstraintsParameterName, "", new ProblemDataConstraint(problemData)));
       emptyProblemData = problemData;
     }

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/ProblemDataConstraint.cs

@@ -35 +35 @@
     private static readonly string exampleInput = "# Example for a target variable constraint:" + Environment.NewLine +
                                                   "Target:'y' in [0 .. 100]" + Environment.NewLine + Environment.NewLine +
-                                                  "# Example for constraint on model parameter: " + Environment.NewLine +
+                                                  "# Example for constraints on model parameters: " + Environment.NewLine +
                                                   "d'y'/d'x' in [0 .. 10]" + Environment.NewLine +
                                                   "∂²'y'/∂'x'² in [-1 .. inf.]";