Changeset 17958 for trunk/HeuristicLab.Problems.DataAnalysis.Symbolic

Timestamp:

04/22/21 14:59:58 (3 years ago)

Author:

gkronber

Message:

#3073: refactoring ShapeConstrainedRegressionProblem as discussed with MKo and CHa

Location:

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

Files:

• Grammars/LinearScalingGrammar.cs (moved) (moved from trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/IntervalArithmeticGrammar.cs) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj (modified) (1 diff)

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/LinearScalingGrammar.cs

@@ -30 +30 @@
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   [StorableType("5A2300A0-D0FC-4F2D-B910-F86384FE9052")]
-  [Item("IntervalArithmeticGrammar", "Represents a grammar for interval arithmetic which includes linear scaling parts implicitly.")]
-  public class IntervalArithmeticGrammar : DataAnalysisGrammar, ISymbolicDataAnalysisGrammar {
-    public IntervalArithmeticGrammar() : base(ItemAttribute.GetName(typeof(IntervalArithmeticGrammar)),
-      ItemAttribute.GetDescription(typeof(IntervalArithmeticGrammar))) {
+  [Item("LinearScalingGrammar", "Represents a grammar which includes linear scaling parts implicitly.")]
+  public class LinearScalingGrammar : DataAnalysisGrammar, ISymbolicDataAnalysisGrammar {
+    public LinearScalingGrammar() : base(ItemAttribute.GetName(typeof(LinearScalingGrammar)),
+      ItemAttribute.GetDescription(typeof(LinearScalingGrammar))) {
       Initialize();
     }
 
     [StorableConstructor]
-    public IntervalArithmeticGrammar(StorableConstructorFlag _) : base(_) { }
+    public LinearScalingGrammar(StorableConstructorFlag _) : base(_) { }
 
-    protected IntervalArithmeticGrammar(IntervalArithmeticGrammar original, Cloner cloner) : base(original, cloner) { }
-    public IntervalArithmeticGrammar(string name, string description) : base(name, description) { }
+    protected LinearScalingGrammar(LinearScalingGrammar original, Cloner cloner) : base(original, cloner) { }
+    public LinearScalingGrammar(string name, string description) : base(name, description) { }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new IntervalArithmeticGrammar(this, cloner);
+      return new LinearScalingGrammar(this, cloner);
     }
 

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj

@@ -159 +159 @@
     <Compile Include="Formatters\SymbolicDataAnalysisExpressionCSharpFormatter.cs" />
     <Compile Include="Grammars\DataAnalysisGrammar.cs" />
-    <Compile Include="Grammars\IntervalArithmeticGrammar.cs" />
+    <Compile Include="Grammars\LinearScalingGrammar.cs" />
     <Compile Include="Hashing\HashExtensions.cs" />
     <Compile Include="Hashing\HashUtil.cs" />