Changeset 8642 for trunk/sources/HeuristicLab.Optimization.Operators

Timestamp:

09/13/12 13:13:00 (12 years ago)

Author:

jkarder

Message:

#1247: integrated branch into trunk

Location:

trunk/sources/HeuristicLab.Optimization.Operators/3.3

Files:

• ExpressionCalculator.cs (copied) (copied from branches/RAPGA/HeuristicLab.Algorithms.RAPGA/3.3/Calculator.cs) (4 diffs)
• HeuristicLab.Optimization.Operators-3.3.csproj (modified) (1 diff)

trunk/sources/HeuristicLab.Optimization.Operators/3.3/ExpressionCalculator.cs

@@ -28 +28 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Algorithms.RAPGA {
+namespace HeuristicLab.Optimization.Operators {
   /// <summary>
   /// An operator that evaluates an expression.
   /// </summary>
-  [Item("Calculator", "An operator that evaluates an expression.")]
+  [Item("ExpressionCalculator", "An operator that evaluates an expression.")]
   [StorableClass]
-  public class Calculator : ValuesCollector {
+  public class ExpressionCalculator : ValuesCollector {
     [Storable]
-    public Optimization.Calculator Calc { get; set; }
+    public Calculator Calculator { get; set; }
 
     #region Parameter Properties
@@ -57 +57 @@
 
     [StorableConstructor]
-    protected Calculator(bool deserializing) : base(deserializing) { }
-    protected Calculator(Calculator original, Cloner cloner)
+    protected ExpressionCalculator(bool deserializing) : base(deserializing) { }
+    protected ExpressionCalculator(ExpressionCalculator original, Cloner cloner)
       : base(original, cloner) {
-      this.Calc = cloner.Clone(original.Calc);
+      this.Calculator = cloner.Clone(original.Calculator);
     }
-    public Calculator()
+    public ExpressionCalculator()
       : base() {
       Parameters.Add(new ValueLookupParameter<IItem>("ExpressionResult", "The result of the evaluated expression."));
@@ -75 +75 @@
   unquoted or in double quotes if they contain special characters or whitespace
 mathematical functions:
-  +, -, /, ^ (power), log
+  +, -, *, /, ^ (power), log
 predicates:
   ==, <, >, isnull, not
@@ -89 +89 @@
 If the final value is null, the result variable is removed if it exists."));
 
-      Calc = new Optimization.Calculator();
+      Calculator = new Calculator();
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new Calculator(this, cloner);
+      return new ExpressionCalculator(this, cloner);
     }
 
     public override IOperation Apply() {
-      Calc.Formula = Formula;
+      Calculator.Formula = Formula;
       var variables = new Dictionary<string, IItem>();
       foreach (var collectedValue in CollectedValues)
         variables[collectedValue.Name] = collectedValue.ActualValue;
-      ExpressionResult = Calc.GetValue(variables);
+      ExpressionResult = Calculator.GetValue(variables);
       return base.Apply();
     }

trunk/sources/HeuristicLab.Optimization.Operators/3.3/HeuristicLab.Optimization.Operators-3.3.csproj

@@ -109 +109 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ExpressionCalculator.cs" />
     <Compile Include="NoSimilarityCalculator.cs" />
     <Compile Include="QualitySimilarityCalculator.cs" />