Changeset 6618 for branches/GP.Grammar.Editor/HeuristicLab.Encodings.RealVectorEncoding

Timestamp:

08/01/11 17:48:53 (13 years ago)

Author:

mkommend

Message:

#1479: Integrated trunk changes.

Location:

branches/GP.Grammar.Editor/HeuristicLab.Encodings.RealVectorEncoding/3.3

Files:

• HeuristicLabEncodingsRealVectorEncodingPlugin.cs.frame (modified) (1 diff)
• Manipulators/PolynomialAllPositionManipulator.cs (modified) (1 diff)
• Manipulators/PolynomialOnePositionManipulator.cs (modified) (1 diff)
• Properties/AssemblyInfo.frame (modified) (1 diff)
• Tests/PolynomialAllPositionManipulatorTest.cs (modified) (2 diffs)
• Tests/Properties/AssemblyInfo.cs (modified) (1 diff)

branches/GP.Grammar.Editor/HeuristicLab.Encodings.RealVectorEncoding/3.3/HeuristicLabEncodingsRealVectorEncodingPlugin.cs.frame

@@ -26 +26 @@
   /// Plugin class for HeuristicLab.Encodings.RealVectorEncoding plugin.
   /// </summary>
-  [Plugin("HeuristicLab.Encodings.RealVectorEncoding", "3.3.4.$WCREV$")]
+  [Plugin("HeuristicLab.Encodings.RealVectorEncoding", "3.3.5.$WCREV$")]
   [PluginFile("HeuristicLab.Encodings.RealVectorEncoding-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Collections", "3.3")]

branches/GP.Grammar.Editor/HeuristicLab.Encodings.RealVectorEncoding/3.3/Manipulators/PolynomialAllPositionManipulator.cs

@@ -87 +87 @@
         if (u < 0.5) {
           delta = Math.Pow(2 * u, 1.0 / (contiguity.Value + 1)) - 1.0;
-        } else if (u > 0.5) {
-          delta = 1.0 - Math.Pow(2.0 - 2.0 * u, 1.0 / contiguity.Value + 1);
-        } else if (u == 0.5) delta = 0;
+        } else if (u >= 0.5) {
+          delta = 1.0 - Math.Pow(2.0 - 2.0 * u, 1.0 / (contiguity.Value + 1));
+        }
 
         vector[index] += delta * maxManipulation.Value;

branches/GP.Grammar.Editor/HeuristicLab.Encodings.RealVectorEncoding/3.3/Manipulators/PolynomialOnePositionManipulator.cs

@@ -89 +89 @@
       if (u < 0.5) {
         delta = Math.Pow(2 * u, 1.0 / (contiguity + 1)) - 1.0;
-      } else if (u > 0.5) {
-        delta = 1.0 - Math.Pow(2.0 - 2.0 * u, 1.0 / contiguity + 1);
-      } else delta = 0;
+      } else if (u >= 0.5) {
+        delta = 1.0 - Math.Pow(2.0 - 2.0 * u, 1.0 / (contiguity + 1));
+      }
 
       return delta;

branches/GP.Grammar.Editor/HeuristicLab.Encodings.RealVectorEncoding/3.3/Properties/AssemblyInfo.frame

@@ -55 +55 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.4.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.5.$WCREV$")]

branches/GP.Grammar.Editor/HeuristicLab.Encodings.RealVectorEncoding/3.3/Tests/PolynomialAllPositionManipulatorTest.cs

@@ -92 +92 @@
       random.DoubleNumbers = new double[] { 0.2, 0.7, 0.8, 0.01, 0.1 };
       parent = new RealVector(new double[] { 0.2, 0.2, 0.3, 0.5, 0.1 });
-      expected = new RealVector(new double[] { 0.120213215256006, 0.336631954950876, 0.474551336679454, 0.322759240811056, -0.0182075293954083 });
+      expected = new RealVector(new double[] { 0.120213215256006, 0.249415354697564, 0.379786784743994, 0.322759240811056, -0.0182075293954083 });
       contiguity = new DoubleValue(0.8);
       maxManipulation = new DoubleValue(0.2);
@@ -106 +106 @@
       try {
         PolynomialAllPositionManipulator.Apply(random, parent, contiguity, maxManipulation);
-      }
-      catch (System.ArgumentException) {
+      } catch (System.ArgumentException) {
         exceptionFired = true;
       }

branches/GP.Grammar.Editor/HeuristicLab.Encodings.RealVectorEncoding/3.3/Tests/Properties/AssemblyInfo.cs

@@ -53 +53 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.3.0")]
+[assembly: AssemblyFileVersion("3.3.5.0")]