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

Timestamp:

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

Author:

mkommend

Message:

#2971: Further minor refactorings and renaming of members.

File:

• branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/IntervalConstraint.cs (modified) (7 diffs)

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;
     }