Changeset 4682 for branches/CloningRefactoring/HeuristicLab.Problems.DataAnalysis

Timestamp:

10/29/10 19:47:39 (14 years ago)

Author:

mkommend

Message:

Refactored ExternalEvaluation.* and fixed some errors and warnings (ticket #922).

Location:

branches/CloningRefactoring/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic

Files:

• SimpleArithmeticExpressionInterpreter.cs (modified) (2 diffs)
• Symbols/Constant.cs (modified) (1 diff)
• Symbols/ConstantTreeNode.cs (modified) (1 diff)
• Symbols/LaggedVariableTreeNode.cs (modified) (1 diff)
• Symbols/Variable.cs (modified) (1 diff)

branches/CloningRefactoring/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/SimpleArithmeticExpressionInterpreter.cs

@@ -109 +109 @@
     [StorableConstructor]
     private SimpleArithmeticExpressionInterpreter(bool deserializing) : base(deserializing) { }
-    private SimpleArithmeticExpressionInterpreter(SimpleArithmeticExpressionInterpreter original, Cloner cloner)      : base(original, cloner) {    }
+    private SimpleArithmeticExpressionInterpreter(SimpleArithmeticExpressionInterpreter original, Cloner cloner) : base(original, cloner) { }
 
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -295 +295 @@
 
     // skips a whole branch
-    protected void SkipBakedCode() {
+    private void SkipBakedCode() {
       int i = 1;
       while (i > 0) {

branches/CloningRefactoring/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/Constant.cs

@@ -78 +78 @@
     #endregion
     [StorableConstructor]
-    protected Constant(bool deserializing) : base(deserializing) { }
-    protected Constant(Constant original, Cloner cloner)
+    private Constant(bool deserializing) : base(deserializing) { }
+    private Constant(Constant original, Cloner cloner)
       : base(original, cloner) {
       minValue = original.minValue;

branches/CloningRefactoring/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/ConstantTreeNode.cs

@@ -42 +42 @@
     private ConstantTreeNode(bool deserializing) : base(deserializing) { }
 
-    protected ConstantTreeNode(ConstantTreeNode original, Cloner cloner)
+    private ConstantTreeNode(ConstantTreeNode original, Cloner cloner)
       : base(original, cloner) {
       constantValue = original.constantValue;

branches/CloningRefactoring/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/LaggedVariableTreeNode.cs

@@ -39 +39 @@
     [StorableConstructor]
     private LaggedVariableTreeNode(bool deserializing) : base(deserializing) { }
-    protected LaggedVariableTreeNode(LaggedVariableTreeNode original, Cloner cloner)
+    private LaggedVariableTreeNode(LaggedVariableTreeNode original, Cloner cloner)
       : base(original, cloner) {
       lag = original.lag;

branches/CloningRefactoring/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/Variable.cs

@@ -114 +114 @@
     }
 
-    public override IDeepClonable Clone(Cloner clone) {
+    public override IDeepCloneable Clone(Cloner cloner) {
       return new Variable(this, cloner);
     }