Free cookie consent management tool by TermsFeed Policy Generator

Changeset 5532


Ignore:
Timestamp:
02/21/11 20:18:09 (14 years ago)
Author:
gkronber
Message:

#1418 copied symbol classes into Problems.DataAnalysis.Symbolic plugin.

Location:
branches/DataAnalysis Refactoring
Files:
1 added
34 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTree.cs

    r5499 r5532  
    7070    }
    7171    public SymbolicExpressionTree() : base() { }
    72     public SymbolicExpressionTree(SymbolicExpressionTreeNode root)
     72    public SymbolicExpressionTree(ISymbolicExpressionTreeNode root)
    7373      : base() {
    7474      this.Root = root;

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj

    r5500 r5532  
    108108  </ItemGroup>
    109109  <ItemGroup>
     110    <Compile Include="Symbols\Addition.cs" />
     111    <Compile Include="Symbols\And.cs" />
     112    <Compile Include="Symbols\Average.cs" />
     113    <Compile Include="Symbols\Constant.cs" />
     114    <Compile Include="Symbols\ConstantTreeNode.cs" />
     115    <Compile Include="Symbols\Cosine.cs" />
     116    <Compile Include="Symbols\Derivative.cs" />
     117    <Compile Include="Symbols\Division.cs" />
     118    <Compile Include="Symbols\Exponential.cs" />
     119    <Compile Include="Symbols\GreaterThan.cs" />
     120    <Compile Include="Symbols\IfThenElse.cs" />
     121    <Compile Include="Symbols\ILaggedTreeNode.cs" />
     122    <Compile Include="Symbols\Integral.cs" />
     123    <Compile Include="Symbols\LaggedSymbol.cs" />
     124    <Compile Include="Symbols\LaggedTreeNode.cs" />
     125    <Compile Include="Symbols\LaggedVariable.cs" />
     126    <Compile Include="Symbols\LaggedVariableTreeNode.cs" />
     127    <Compile Include="Symbols\LessThan.cs" />
     128    <Compile Include="Symbols\Logarithm.cs" />
     129    <Compile Include="Symbols\Multiplication.cs" />
     130    <Compile Include="Symbols\Not.cs" />
     131    <Compile Include="Symbols\Or.cs" />
     132    <Compile Include="Symbols\Power.cs" />
     133    <Compile Include="Symbols\Root.cs" />
     134    <Compile Include="Symbols\Sine.cs" />
     135    <Compile Include="Symbols\Subtraction.cs" />
     136    <Compile Include="Symbols\Tangent.cs" />
     137    <Compile Include="Symbols\TimeLag.cs" />
     138    <Compile Include="Symbols\Variable.cs" />
     139    <Compile Include="Symbols\VariableCondition.cs" />
     140    <Compile Include="Symbols\VariableConditionTreeNode.cs" />
     141    <Compile Include="Symbols\VariableTreeNode.cs" />
    110142    <None Include="HeuristicLab.snk" />
    111143    <None Include="HeuristicLabProblemsDataAnalysisSymbolicPlugin.cs.frame" />

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Addition.cs

    r5445 r5532  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbols;
    2524using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
     25using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
     26namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    2727  [StorableClass]
    2828  [Item("Addition", "Symbol that represents the + operator.")]

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/And.cs

    r5445 r5532  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbols;
     24using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
     26namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    2727  [StorableClass]
    2828  [Item("And", "Symbol that represents the boolean AND operator.")]

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Average.cs

    r5445 r5532  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbols;
     24using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
     26namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    2727  [StorableClass]
    2828  [Item("Average", "Symbol that represents the average (arithmetic mean) function.")]

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Constant.cs

    r5445 r5532  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    26 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbols;
    2726using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    28 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
     27namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    2928  [StorableClass]
    3029  [Item("Constant", "Represents a constant value.")]
    … …  
    109108    }
    110109
    111     public override SymbolicExpressionTreeNode CreateTreeNode() {
     110    public override ISymbolicExpressionTreeNode CreateTreeNode() {
    112111      return new ConstantTreeNode(this);
    113112    }

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/ConstantTreeNode.cs

    r5445 r5532  
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2626using HeuristicLab.Random;
    27 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
     27namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    2828  [StorableClass]
    2929  public sealed class ConstantTreeNode : SymbolicExpressionTreeTerminalNode {

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Cosine.cs

    r5445 r5532  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbols;
     24using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
     26namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    2727  [StorableClass]
    2828  [Item("Cosine", "Symbol that represents the cosine function.")]

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Derivative.cs

    r5445 r5532  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbols;
     24using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
     26namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    2727  [StorableClass]
    2828  [Item("Derivative", "Represents the derivative over the specified subtree.")]

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Division.cs

    r5445 r5532  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbols;
     24using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
     26namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    2727  [StorableClass]
    2828  [Item("Division", "Symbol that represents the / operator.")]

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Exponential.cs

    r5445 r5532  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbols;
     24using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
     26namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    2727  [StorableClass]
    2828  [Item("Exponential", "Symbol that represents the exponential function.")]

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/GreaterThan.cs

    r5445 r5532  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbols;
     24using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
     26namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    2727  [StorableClass]
    2828  [Item("GreaterThan", "Symbol that represents a greater than relation.")]

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/IfThenElse.cs

    r5445 r5532  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbols;
     24using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
     26namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    2727  [StorableClass]
    2828  [Item("IfThenElse", "Symbol that represents a conditional operator.")]

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Integral.cs

    r5445 r5532  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    25 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
     25namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    2626  [StorableClass]
    2727  [Item("Integral", "Represents the integral over the specified subtree.")]

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/LaggedSymbol.cs

    r5373 r5532  
    22using HeuristicLab.Core;
    33using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    4 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbols;
    54using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    65
    7 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
     6namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    87  [StorableClass]
    98  [Item("LaggedSymbol", "Represents a symblol whose evaluation is shifted.")]
    … …  
    3837    }
    3938
    40     public override SymbolicExpressionTreeNode CreateTreeNode() {
     39    public override ISymbolicExpressionTreeNode CreateTreeNode() {
    4140      return new LaggedTreeNode(this);
    4241    }

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/LaggedTreeNode.cs

    r5445 r5532  
    2525using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    27 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
     27namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    2828  [StorableClass]
    2929  public class LaggedTreeNode : SymbolicExpressionTreeNode, ILaggedTreeNode {

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/LaggedVariable.cs

    r5445 r5532  
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
     26namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    2727  [StorableClass]
    2828  [Item("LaggedVariable", "Represents a variable value with a time offset.")]
    … …  
    5252    }
    5353
    54     public override SymbolicExpressionTreeNode CreateTreeNode() {
     54    public override ISymbolicExpressionTreeNode CreateTreeNode() {
    5555      return new LaggedVariableTreeNode(this);
    5656    }

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/LaggedVariableTreeNode.cs

    r5445 r5532  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
     26namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    2727  [StorableClass]
    2828  public sealed class LaggedVariableTreeNode : VariableTreeNode, ILaggedTreeNode {

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/LessThan.cs

    r5445 r5532  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbols;
     24using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
     26namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    2727  [StorableClass]
    2828  [Item("LessThan", "Symbol that represents a less than relation.")]

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Logarithm.cs

    r5445 r5532  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbols;
     24using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
     26namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    2727  [StorableClass]
    2828  [Item("Logarithm", "Symbol that represents the logarithm function.")]

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Multiplication.cs

    r5445 r5532  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbols;
     24using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
     26namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    2727  [StorableClass]
    2828  [Item("Multiplication", "Symbol that represents the * operator.")]

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Not.cs

    r5445 r5532  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbols;
     24using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
     26namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    2727  [StorableClass]
    2828  [Item("Not", "Symbol that represents the boolean NOT operator.")]

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Or.cs

    r5445 r5532  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbols;
     24using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
     26namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    2727  [StorableClass]
    2828  [Item("Or", "Symbol that represents the boolean OR operator.")]

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Power.cs

    r5445 r5532  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbols;
     24using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
     26namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    2727  [StorableClass]
    2828  [Item("Power", "Symbol that represents the power function.")]

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Root.cs

    r5445 r5532  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbols;
     24using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
     26namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    2727  [StorableClass]
    2828  [Item("Root", "Symbol that represents the n-th root function.")]

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Sine.cs

    r5445 r5532  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbols;
     24using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
     26namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    2727  [StorableClass]
    2828  [Item("Sine", "Symbol that represents the sine function.")]

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Subtraction.cs

    r5445 r5532  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbols;
     24using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
     26namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    2727  [StorableClass]
    2828  [Item("Subtraction", "Symbol that represents the - operator.")]

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Tangent.cs

    r5445 r5532  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbols;
     24using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
     26namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    2727  [StorableClass]
    2828  [Item("Tangent", "Symbol that represents the tangent trigonometric function.")]

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/TimeLag.cs

    r5445 r5532  
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2525
    26 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
     26namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    2727  [StorableClass]
    2828  [Item("TimeLag", "Represents a symblol whose evaluation is shifted.")]

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Variable.cs

    r5445 r5532  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    27 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbols;
    2827using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    29 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
     28namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    3029  [StorableClass]
    3130  [Item("Variable", "Represents a variable value.")]
    … …  
    127126    }
    128127
    129     public override SymbolicExpressionTreeNode CreateTreeNode() {
     128    public override ISymbolicExpressionTreeNode CreateTreeNode() {
    130129      return new VariableTreeNode(this);
    131130    }

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/VariableCondition.cs

    r5484 r5532  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    27 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbols;
    2827using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2928
    30 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
     29namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    3130  [StorableClass]
    3231  [Item("Variable Condition", "Represents a condition that tests a given variable.")]
    … …  
    180179    }
    181180
    182     public override SymbolicExpressionTreeNode CreateTreeNode() {
     181    public override ISymbolicExpressionTreeNode CreateTreeNode() {
    183182      return new VariableConditionTreeNode(this);
    184183    }

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/VariableConditionTreeNode.cs

    r5467 r5532  
    2727using HeuristicLab.Random;
    2828
    29 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
     29namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    3030  [StorableClass]
    3131  public sealed class VariableConditionTreeNode : SymbolicExpressionTreeNode {

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/VariableTreeNode.cs

    r5467 r5532  
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2626using HeuristicLab.Random;
    27 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
     27namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    2828  [StorableClass]
    2929  public class VariableTreeNode : SymbolicExpressionTreeTerminalNode {

  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IDataAnalysisProblemData.cs

    r5509 r5532  
    2929    IEnumerable<string> InputVariables { get; }
    3030
    31     int TrainingSamplesStart { get; }
    32     int TrainingSamplesEnd { get; }
    33     int TestSamplesStart { get; }
    34     int TestSamplesEnd { get; }
     31    int TrainingSamplesStart { get; set; }
     32    int TrainingSamplesEnd { get; set; }
     33    int TestSamplesStart { get; set; }
     34    int TestSamplesEnd { get; set; }
    3535
    3636    event EventHandler Changed;
Note: See TracChangeset for help on using the changeset viewer.