Changeset 12369 for branches/VOSGA

Timestamp:

04/30/15 10:35:55 (10 years ago)

Author:

ascheibe

Message:

#2267 added a value modifier

Location:

branches/VOSGA

Files:

• HeuristicLab.Algorithms.VOffspringSelectionGeneticAlgorithm-3.3.sln (modified) (2 diffs)
• HeuristicLab.Algorithms.VOffspringSelectionGeneticAlgorithm/HeuristicLab.Algorithms.VOffspringSelectionGeneticAlgorithm-3.3.csproj (modified) (1 diff)
• HeuristicLab.Algorithms.VOffspringSelectionGeneticAlgorithm/LinearDiscreteReverseDoubleValueModifier.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization.Operators/3.3/LinearDiscreteDoubleValueModifier.cs) (1 diff)

branches/VOSGA/HeuristicLab.Algorithms.VOffspringSelectionGeneticAlgorithm-3.3.sln

@@ -2 +2 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.30723.0
+VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.VOffspringSelectionGeneticAlgorithm-3.3", "HeuristicLab.Algorithms.VOffspringSelectionGeneticAlgorithm\HeuristicLab.Algorithms.VOffspringSelectionGeneticAlgorithm-3.3.csproj", "{F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{41DDAEFF-914B-49BB-BB67-A9271C21F24E}"
 EndProject
 Global
@@ -32 +34 @@
     HideSolutionNode = FALSE
   EndGlobalSection
+  GlobalSection(Performance) = preSolution
+    HasPerformanceSessions = true
+  EndGlobalSection
 EndGlobal

branches/VOSGA/HeuristicLab.Algorithms.VOffspringSelectionGeneticAlgorithm/HeuristicLab.Algorithms.VOffspringSelectionGeneticAlgorithm-3.3.csproj

@@ -179 +179 @@
     <Compile Include="Comparators\WeightedParentsQualityComparator.cs" />
     <Compile Include="ISubScopesQualityComparatorOperator.cs" />
+    <Compile Include="LinearDiscreteReverseDoubleValueModifier.cs" />
     <Compile Include="OffspringCollector.cs" />
     <Compile Include="OffspringSelectors\IOffspringSelector.cs" />

branches/VOSGA/HeuristicLab.Algorithms.VOffspringSelectionGeneticAlgorithm/LinearDiscreteReverseDoubleValueModifier.cs

@@ -28 +28 @@
   /// Modifies the value by linear (constant) fall or rise.
   /// </summary>
-  [Item("LinearDiscreteDoubleValueModifier", "Modifies the value by linear (constant) fall or rise.")]
+  [Item("LinearDiscreteReverseDoubleValueModifier", "Modifies the value by linear (constant) fall or rise.")]
   [StorableClass]
-  public class LinearDiscreteDoubleValueModifier : DiscreteDoubleValueModifier {
+  public class LinearDiscreteReverseDoubleValueModifier : DiscreteDoubleValueModifier {
     [StorableConstructor]
-    protected LinearDiscreteDoubleValueModifier(bool deserializing) : base(deserializing) { }
-    protected LinearDiscreteDoubleValueModifier(LinearDiscreteDoubleValueModifier original, Cloner cloner) : base(original, cloner) { }
-    public LinearDiscreteDoubleValueModifier() : base() { }
+    protected LinearDiscreteReverseDoubleValueModifier(bool deserializing) : base(deserializing) { }
+    protected LinearDiscreteReverseDoubleValueModifier(LinearDiscreteReverseDoubleValueModifier original, Cloner cloner) : base(original, cloner) { }
+    public LinearDiscreteReverseDoubleValueModifier() : base() { }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new LinearDiscreteDoubleValueModifier(this, cloner);
+      return new LinearDiscreteReverseDoubleValueModifier(this, cloner);
     }
 
     protected override double Modify(double value, double startValue, double endValue, int index, int startIndex, int endIndex) {
       double k = (endValue - startValue) / (endIndex - startIndex);
-      double x = index - startIndex;
+      double x = endIndex - index;
       return k * x + startValue;
     }