Changeset 2794 for trunk

Timestamp:

02/14/10 05:31:49 (15 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on operators

Location:

trunk/sources

Files:

• HeuristicLab.Evolutionary/3.3/ChildrenCreator.cs (added)
• HeuristicLab.Evolutionary/3.3/ChildrenInitializer.cs (deleted)
• HeuristicLab.Evolutionary/3.3/CrossoverBase.cs (deleted)
• HeuristicLab.Evolutionary/3.3/HeuristicLab.Evolutionary-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Evolutionary/3.3/HeuristicLabEvolutionaryPlugin.cs.frame (modified) (2 diffs)
• HeuristicLab.Operators/3.3/Assigner.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/CombinedOperator.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/Comparator.cs (modified) (2 diffs)
• HeuristicLab.Operators/3.3/ConditionalBranch.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/DoubleCounter.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/EmptyOperator.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/HeuristicLab.Operators-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Operators/3.3/HeuristicLabOperatorsPlugin.cs.frame (modified) (1 diff)
• HeuristicLab.Operators/3.3/IntCounter.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/MultipleCallsOperator.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/Operator.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/ParallelSubScopesProcessor.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/Placeholder.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/ScopeCleaner.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/SequentialSubScopesProcessor.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/SingleCallOperator.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/SingleSuccessorOperator.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/StochasticBranch.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/SubScopesCreator.cs (moved) (moved from trunk/sources/HeuristicLab.Operators/3.3/SubScopesCreater.cs) (3 diffs)
• HeuristicLab.Operators/3.3/SubScopesRemover.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/SubScopesSorter.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/UniformParallelSubScopesProcessor.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/UniformSequentialSubScopesProcessor.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/ValuesCollector.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/VariableCreator.cs (moved) (moved from trunk/sources/HeuristicLab.Operators/3.3/VariableInjector.cs) (3 diffs)
• HeuristicLab.Permutation/3.3/HeuristicLab.Permutation-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Permutation/3.3/HeuristicLabPermutationPlugin.cs.frame (modified) (2 diffs)
• HeuristicLab.Permutation/3.3/InversionManipulator.cs (modified) (4 diffs)
• HeuristicLab.Permutation/3.3/OrderCrossover.cs (modified) (3 diffs)
• HeuristicLab.Permutation/3.3/Permutation.cs (modified) (2 diffs)
• HeuristicLab.Permutation/3.3/PermutationCrossover.cs (added)
• HeuristicLab.Permutation/3.3/PermutationCrossoverBase.cs (deleted)
• HeuristicLab.Permutation/3.3/PermutationManipulator.cs (added)
• HeuristicLab.Permutation/3.3/PermutationManipulatorBase.cs (deleted)
• HeuristicLab.Permutation/3.3/RandomPermutationCreator.cs (moved) (moved from trunk/sources/HeuristicLab.Permutation/3.3/RandomPermutationGenerator.cs) (2 diffs)
• HeuristicLab.Random/3.3/HeuristicLab.Random-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Random/3.3/HeuristicLabRandomPlugin.cs.frame (modified) (1 diff)
• HeuristicLab.Random/3.3/MersenneTwister.cs (modified) (1 diff)
• HeuristicLab.Random/3.3/NormalDistributedRandom.cs (modified) (1 diff)
• HeuristicLab.Random/3.3/RandomCreator.cs (moved) (moved from trunk/sources/HeuristicLab.Random/3.3/RandomInitializer.cs) (3 diffs)

trunk/sources/HeuristicLab.Evolutionary/3.3/HeuristicLab.Evolutionary-3.3.csproj

@@ -84 +84 @@
     <Compile Include="HeuristicLabEvolutionaryPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ChildrenCreator.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -90 +91 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
+      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
+      <Name>HeuristicLab.Collections-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
@@ -101 +106 @@
       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
       <Name>HeuristicLab.Operators-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
+      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
+      <Name>HeuristicLab.Parameters-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
+      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
+      <Name>HeuristicLab.Persistence-3.3</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">

trunk/sources/HeuristicLab.Evolutionary/3.3/HeuristicLabEvolutionaryPlugin.cs.frame

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using HeuristicLab.PluginInfrastructure;
 
@@ -31 +28 @@
   [Plugin("HeuristicLab.Evolutionary", "3.3.0.$WCREV$")]
   [PluginFile("HeuristicLab.Evolutionary-3.3.dll", PluginFileType.Assembly)]
+  [PluginDependency("HeuristicLab.Collections", "3.3")]
   [PluginDependency("HeuristicLab.Core", "3.3")]
   [PluginDependency("HeuristicLab.Data", "3.3")]
   [PluginDependency("HeuristicLab.Operators", "3.3")]
+  [PluginDependency("HeuristicLab.Parameters", "3.3")]
+  [PluginDependency("HeuristicLab.Persistence", "3.3")]
   public class HeuristicLabEvolutionaryPlugin : PluginBase {
   }

trunk/sources/HeuristicLab.Operators/3.3/Assigner.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;

trunk/sources/HeuristicLab.Operators/3.3/CombinedOperator.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
 using System.Drawing;
-using System.Text;
-using System.Xml;
 using HeuristicLab.Collections;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 

trunk/sources/HeuristicLab.Operators/3.3/Comparator.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -30 +28 @@
 namespace HeuristicLab.Operators {
   /// <summary>
-  /// Operator which increments an integer variable.
+  /// An operator which compares two items.
   /// </summary>
   [Item("Comparator", "An operator which compares two items.")]

trunk/sources/HeuristicLab.Operators/3.3/ConditionalBranch.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Xml;
 using HeuristicLab.Core;
 using HeuristicLab.Data;

trunk/sources/HeuristicLab.Operators/3.3/DoubleCounter.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using HeuristicLab.Core;
 using HeuristicLab.Data;

trunk/sources/HeuristicLab.Operators/3.3/EmptyOperator.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Xml;
+using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Core;
 
 namespace HeuristicLab.Operators {

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

@@ -98 +98 @@
     <Compile Include="SequentialSubScopesProcessor.cs" />
     <Compile Include="StochasticBranch.cs" />
+    <Compile Include="SubScopesCreator.cs" />
     <Compile Include="SubScopesRemover.cs" />
     <Compile Include="SubScopesSorter.cs" />
@@ -110 +111 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SingleSuccessorOperator.cs" />
-    <Compile Include="SubScopesCreater.cs" />
     <Compile Include="ValuesCollector.cs" />
-    <Compile Include="VariableInjector.cs">
-      <SubType>Code</SubType>
-    </Compile>
+    <Compile Include="VariableCreator.cs" />
   </ItemGroup>
   <ItemGroup>

trunk/sources/HeuristicLab.Operators/3.3/HeuristicLabOperatorsPlugin.cs.frame

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using HeuristicLab.PluginInfrastructure;
 

trunk/sources/HeuristicLab.Operators/3.3/IntCounter.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using HeuristicLab.Core;
 using HeuristicLab.Data;

trunk/sources/HeuristicLab.Operators/3.3/MultipleCallsOperator.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Xml;
 using HeuristicLab.Collections;
 using HeuristicLab.Core;

trunk/sources/HeuristicLab.Operators/3.3/Operator.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Xml;
 using System.Drawing;
+using HeuristicLab.Collections;
+using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Core;
-using HeuristicLab.Collections;
 
 namespace HeuristicLab.Operators {

trunk/sources/HeuristicLab.Operators/3.3/ParallelSubScopesProcessor.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Xml;
-using HeuristicLab.Collections;
 using HeuristicLab.Core;
-using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Operators {

trunk/sources/HeuristicLab.Operators/3.3/Placeholder.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Xml;
 using HeuristicLab.Core;
 using HeuristicLab.Parameters;

trunk/sources/HeuristicLab.Operators/3.3/ScopeCleaner.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using HeuristicLab.Core;
 using HeuristicLab.Parameters;

trunk/sources/HeuristicLab.Operators/3.3/SequentialSubScopesProcessor.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Xml;
-using HeuristicLab.Collections;
 using HeuristicLab.Core;
-using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Operators {

trunk/sources/HeuristicLab.Operators/3.3/SingleCallOperator.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Xml;
 using HeuristicLab.Core;
 using HeuristicLab.Parameters;

trunk/sources/HeuristicLab.Operators/3.3/SingleSuccessorOperator.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Xml;
 using HeuristicLab.Core;
 using HeuristicLab.Parameters;

trunk/sources/HeuristicLab.Operators/3.3/StochasticBranch.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Xml;
 using HeuristicLab.Core;
 using HeuristicLab.Data;

trunk/sources/HeuristicLab.Operators/3.3/SubScopesCreator.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -32 +29 @@
   /// An operator which adds new and empty sub-scopes to the current scope.
   /// </summary>
-  [Item("SubScopesCreater", "An operator which adds new and empty sub-scopes to the current scope.")]
+  [Item("SubScopesCreator", "An operator which adds new and empty sub-scopes to the current scope.")]
   [EmptyStorableClass]
   [Creatable("Test")]
-  public class SubScopesCreater : SingleSuccessorOperator {
+  public class SubScopesCreator : SingleSuccessorOperator {
     public ValueLookupParameter<IntData> NumberOfSubScopesParameter {
       get { return (ValueLookupParameter<IntData>)Parameters["NumberOfSubScopes"]; }
@@ -46 +43 @@
     }
 
-    public SubScopesCreater()
+    public SubScopesCreator()
       : base() {
       Parameters.Add(new ValueLookupParameter<IntData>("NumberOfSubScopes", "The number of new and empty sub-scopes which should be added to the current scope."));

trunk/sources/HeuristicLab.Operators/3.3/SubScopesRemover.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using HeuristicLab.Core;
 using HeuristicLab.Data;

trunk/sources/HeuristicLab.Operators/3.3/SubScopesSorter.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using HeuristicLab.Core;
 using HeuristicLab.Data;

trunk/sources/HeuristicLab.Operators/3.3/UniformParallelSubScopesProcessor.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Xml;
 using HeuristicLab.Core;
 using HeuristicLab.Parameters;

trunk/sources/HeuristicLab.Operators/3.3/UniformSequentialSubScopesProcessor.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Xml;
 using HeuristicLab.Core;
 using HeuristicLab.Parameters;

trunk/sources/HeuristicLab.Operators/3.3/ValuesCollector.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Xml;
 using HeuristicLab.Collections;
 using HeuristicLab.Core;
-using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 

trunk/sources/HeuristicLab.Operators/3.3/VariableCreator.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Xml;
-using HeuristicLab.Collections;
 using HeuristicLab.Core;
 using HeuristicLab.Parameters;
@@ -34 +28 @@
   /// An operator which collects the actual values of parameters and clones them into the current scope.
   /// </summary>
-  [Item("VariableInjector", "An operator which collects the actual values of parameters and clones them into the current scope.")]
+  [Item("VariableCreator", "An operator which collects the actual values of parameters and clones them into the current scope.")]
   [Creatable("Test")]
   [EmptyStorableClass]
-  public class VariableInjector : ValuesCollector {
+  public class VariableCreator : ValuesCollector {
     protected ScopeParameter CurrentScopeParameter {
       get { return (ScopeParameter)Parameters["CurrentScope"]; }
@@ -45 +39 @@
     }
 
-    public VariableInjector()
+    public VariableCreator()
       : base() {
       Parameters.Add(new ScopeParameter("CurrentScope", "The current scope into which the parameter values are cloned."));

trunk/sources/HeuristicLab.Permutation/3.3/HeuristicLab.Permutation-3.3.csproj

@@ -82 +82 @@
   <ItemGroup>
     <None Include="HeuristicLabPermutationPlugin.cs.frame" />
+    <Compile Include="InversionManipulator.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="PermutationManipulator.cs" />
     <Compile Include="HeuristicLabPermutationPlugin.cs" />
+    <Compile Include="OrderCrossover.cs" />
+    <Compile Include="PermutationCrossover.cs" />
+    <Compile Include="Permutation.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="RandomPermutationCreator.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -90 +98 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
+      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
+      <Name>HeuristicLab.Collections-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Common\3.2\HeuristicLab.Common-3.2.csproj">
+      <Project>{1FC004FC-59AF-4249-B1B6-FF25873A20E4}</Project>
+      <Name>HeuristicLab.Common-3.2</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
@@ -98 +114 @@
       <Name>HeuristicLab.Data-3.3</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Evolutionary\3.3\HeuristicLab.Evolutionary-3.3.csproj">
-      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
-      <Name>HeuristicLab.Evolutionary-3.3</Name>
+    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
+      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
+      <Name>HeuristicLab.Operators-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
+      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
+      <Name>HeuristicLab.Parameters-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
+      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
+      <Name>HeuristicLab.Persistence-3.3</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
       <Name>HeuristicLab.PluginInfrastructure</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
-      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
-      <Name>HeuristicLab.Random-3.3</Name>
     </ProjectReference>
   </ItemGroup>

trunk/sources/HeuristicLab.Permutation/3.3/HeuristicLabPermutationPlugin.cs.frame

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using HeuristicLab.PluginInfrastructure;
 
@@ -31 +28 @@
   [Plugin("HeuristicLab.Permutation", "3.3.0.$WCREV$")]
   [PluginFile("HeuristicLab.Permutation-3.3.dll", PluginFileType.Assembly)]
+  [PluginDependency("HeuristicLab.Collections", "3.3")]
+  [PluginDependency("HeuristicLab.Common", "3.2")]
   [PluginDependency("HeuristicLab.Core", "3.3")]
   [PluginDependency("HeuristicLab.Data", "3.3")]
-  [PluginDependency("HeuristicLab.Evolutionary", "3.3")]
-  [PluginDependency("HeuristicLab.Random", "3.3")]
+  [PluginDependency("HeuristicLab.Operators", "3.3")]
+  [PluginDependency("HeuristicLab.Parameters", "3.3")]
+  [PluginDependency("HeuristicLab.Persistence", "3.3")]
   public class HeuristicLabPermutationPlugin : PluginBase {
   }

trunk/sources/HeuristicLab.Permutation/3.3/InversionManipulator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2008 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using HeuristicLab.Core;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Permutation {
   /// <summary>
-  /// Manipulates a permutation array by reversing a randomly chosen interval.
+  /// An operator which inverts a randomly chosen part of a permutation.
   /// </summary>
-  public class InversionManipulator : PermutationManipulatorBase {
-    /// <inheritdoc select="summary"/>
-    public override string Description {
-      get { return @"TODO\r\nOperator description still missing ..."; }
-    }
+  [Item("InversionManipulator", "An operator which inverts a randomly chosen part of a permutation.")]
+  [EmptyStorableClass]
+  [Creatable("Test")]
+  public class InversionManipulator : PermutationManipulator {
 
     /// <summary>
-    /// Reverses the specified <paramref name="permutation"/> between two randomly generated positions.
+    /// Inverts a randomly chosen part of a permutation.
     /// </summary>
-    /// <param name="random">The random number generator.</param>
-    /// <param name="permutation">The permutation array to manipulate.</param>
-    /// <returns>The new permuation array with the manipulated data.</returns>
-    public static int[] Apply(IRandom random, int[] permutation) {
-      int[] result = (int[])permutation.Clone();
+    /// <param name="random">A random number generator.</param>
+    /// <param name="permutation">The permutation to manipulate.</param>
+    /// <returns>The new manipulated permutation.</returns>
+    public static Permutation Apply(IRandom random, Permutation permutation) {
+      Permutation result = (Permutation)permutation.Clone();
       int breakPoint1, breakPoint2;
 
@@ -51 +48 @@
       if (breakPoint2 < breakPoint1) { int h = breakPoint1; breakPoint1 = breakPoint2; breakPoint2 = h; }
 
-      for (int i = 0; i <= (breakPoint2 - breakPoint1); i++) {  // reverse permutation between breakpoints
+      for (int i = 0; i <= (breakPoint2 - breakPoint1); i++) {  // invert permutation between breakpoints
         result[breakPoint1 + i] = permutation[breakPoint2 - i];
       }
@@ -58 +55 @@
 
     /// <summary>
-    /// Reverses the specified <paramref name="permutation"/> between two randomly generated positions.
+    /// Inverts a randomly chosen part of a permutation.
     /// </summary>
-    /// <remarks>Calls <see cref="Apply"/>.</remarks>
-    /// <param name="scope">The current scope.</param>
-    /// <param name="random">The random number generator.</param>
-    /// <param name="permutation">The permutation array to manipulate.</param>
-    /// <returns>The new permuation array with the manipulated data.</returns>
-    protected override int[] Manipulate(IScope scope, IRandom random, int[] permutation) {
+    /// <param name="random">A random number generator.</param>
+    /// <param name="permutation">The permutation to manipulate.</param>
+    /// <returns>The new manipulated permuation.</returns>
+    protected override Permutation Manipulate(IRandom random, Permutation permutation) {
       return Apply(random, permutation);
     }

trunk/sources/HeuristicLab.Permutation/3.3/OrderCrossover.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2008 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Permutation {
   /// <summary>
-  /// Performs a cross over permutation between two permuation arrays
-  /// by taking a randomly chosen interval from the frist, preserving the positions,
-  /// then the missing values from the second array in the order they occur in the second array.
+  /// An operator which performs an order crossover of two permutations.
   /// </summary>
-  public class OrderCrossover : PermutationCrossoverBase {
-    /// <inheritdoc select="summary"/>
-    public override string Description {
-      get { return @"TODO\r\nOperator description still missing ..."; }
-    }
-
+  /// <remarks>
+  /// Crosses two permutations by taking a randomly chosen interval from the frist permutation, preserving
+  /// the positions, and then the missing values from the second permutation in the order they occur in the
+  /// second permutation.
+  /// </remarks>
+  [Item("OrderCrossover", "An operator which performs an order crossover of two permutations.")]
+  [EmptyStorableClass]
+  [Creatable("Test")]
+  public class OrderCrossover : PermutationCrossover {
     /// <summary>
-    /// Performs a cross over permutation of <paramref name="parent1"/> and 
-    /// <paramref name="parent2"/> by taking a randomly chosen interval from <paramref name="parent1"/>,
-    /// preserving the positions and then the missing values from <paramref name="parent2"/> in the 
-    /// order they occur in <paramref name="parent2"/>.
+    /// Performs an order crossover of two permutations.
     /// </summary>
-    /// <param name="random">The random number generator.</param>
-    /// <param name="parent1">The parent scope 1 to cross over.</param>
-    /// <param name="parent2">The parent scope 2 to cross over.</param>
-    /// <returns>The created cross over permutation as int array.</returns>
-    public static int[] Apply(IRandom random, int[] parent1, int[] parent2) {
-      int[] result = new int[parent1.Length];
+    /// <param name="random">A random number generator.</param>
+    /// <param name="parent1">The first parent permutation to cross.</param>
+    /// <param name="parent2">The second parent permutation to cross.</param>
+    /// <returns>The new permutation resulting from the crossover.</returns>
+    public static Permutation Apply(IRandom random, Permutation parent1, Permutation parent2) {
+      Permutation result = new Permutation(parent1.Length);
       bool[] copied = new bool[result.Length];
 
@@ -74 +70 @@
 
     /// <summary>
-    /// Performs an order crossover operation for two given parent permutations.
+    /// Performs an order crossover of two permutations.
     /// </summary>
     /// <exception cref="InvalidOperationException">Thrown if there are not exactly two parents.</exception>
-    /// <param name="scope">The current scope.</param>
     /// <param name="random">A random number generator.</param>
     /// <param name="parents">An array containing the two permutations that should be crossed.</param>
-    /// <returns>The newly created permutation, resulting from the crossover operation.</returns>
-    protected override int[] Cross(IScope scope, IRandom random, int[][] parents) {
-      if (parents.Length != 2) throw new InvalidOperationException("ERROR in OrderCrossover: The number of parents is not equal to 2");
+    /// <returns>The new permutation resulting from the crossover.</returns>
+    protected override Permutation Cross(IRandom random, ItemArray<Permutation> parents) {
+      if (parents.Length != 2) throw new InvalidOperationException("Number of parents is not equal to 2.");
       return Apply(random, parents[0], parents[1]);
     }

trunk/sources/HeuristicLab.Permutation/3.3/Permutation.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2008 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
 using System.Text;
-using System.Xml;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Permutation {
-  /// <summary>
-  /// The base class for a permutation, which is an ordered combination. 
-  /// </summary>
-  public class Permutation : IntArrayData {
-    /// <summary>
-    /// Initializes a new instance of <see cref="Permutation"/>.
-    /// </summary>
-    public Permutation()
-      : base() {
+  [EmptyStorableClass]
+  [Item("Permutation", "Represents a permutation of integer values.")]
+  [Creatable("Test")]
+  public sealed class Permutation : ValueTypeArrayData<int>, IStringConvertibleMatrixData {
+    public Permutation() : base() { }
+    public Permutation(int length)
+      : base(length) {
+      for (int i = 0; i < length; i++)
+        this[i] = i;
     }
-    /// <summary>
-    /// Initializes a new instance of <see cref="Permutation"/> with the given 
-    /// <paramref name="permutation"/> array.
-    /// </summary>
-    /// <param name="permutation">The permutation array to assign.</param>
-    public Permutation(int[] permutation)
-      : base(permutation) {
+    public Permutation(int length, IRandom random)
+      : this(length) {
+      Randomize(random);
     }
+    public Permutation(int[] elements)
+      : base(elements) {
+      if (!Validate()) throw new ArgumentException("Elements do not represent a valid permutation.");
+    }
+    private Permutation(Permutation elements) : base(elements) { }
 
-    /// <summary>
-    /// Clones the current instance.
-    /// </summary>
-    /// <param name="clonedObjects">A dictionary of all already cloned objects. (Needed to 
-    /// avoid cycles.)</param>
-    /// <returns>The cloned object as <see cref="Permutation"/>.</returns>
-    public override IItem Clone(ICloner cloner) {
-      Permutation clone = new Permutation((int[])Data.Clone());
+    public override IDeepCloneable Clone(Cloner cloner) {
+      Permutation clone = new Permutation(this);
       cloner.RegisterClonedObject(this, clone);
       return clone;
     }
+
+    public bool Validate() {
+      bool[] values = new bool[Length];
+      int value;
+
+      for (int i = 0; i < values.Length; i++)
+        values[i] = false;
+      for (int i = 0; i < Length; i++) {
+        value = this[i];
+        if ((value < 0) || (value >= values.Length)) return false;
+        if (values[value]) return false;
+        values[value] = true;
+      }
+      return true;
+    }
+
+    public void Randomize(IRandom random, int startIndex, int length) {  // Knuth shuffle
+      int index1, index2;
+      int val;
+      for (int i = length - 1; i > 0; i--) {
+        index1 = startIndex + i;
+        index2 = startIndex + random.Next(i + 1);
+        if (index1 != index2) {
+          val = this[index1];
+          this[index1] = this[index2];
+          this[index2] = val;
+        }
+      }
+    }
+    public void Randomize(IRandom random) {
+      Randomize(random, 0, Length);
+    }
+
+    #region IStringConvertibleMatrixData Members
+    StringConvertibleArrayDataDimensions IStringConvertibleMatrixData.Dimensions {
+      get { return StringConvertibleArrayDataDimensions.Rows; }
+    }
+    int IStringConvertibleMatrixData.Rows {
+      get { return Length; }
+      set { Length = value; }
+    }
+    int IStringConvertibleMatrixData.Columns {
+      get { return 1; }
+      set { throw new NotSupportedException("Columns cannot be changed."); }
+    }
+
+    bool IStringConvertibleMatrixData.Validate(string value, out string errorMessage) {
+      int val;
+      bool valid = int.TryParse(value, out val);
+      errorMessage = string.Empty;
+      if (!valid) {
+        StringBuilder sb = new StringBuilder();
+        sb.Append("Invalid Value (Valid Value Format: \"");
+        sb.Append(FormatPatterns.GetIntFormatPattern());
+        sb.Append("\")");
+        errorMessage = sb.ToString();
+      }
+      return valid;
+    }
+    string IStringConvertibleMatrixData.GetValue(int rowIndex, int columIndex) {
+      return this[rowIndex].ToString();
+    }
+    bool IStringConvertibleMatrixData.SetValue(string value, int rowIndex, int columnIndex) {
+      int val;
+      if (int.TryParse(value, out val)) {
+        this[rowIndex] = val;
+        return true;
+      } else {
+        return false;
+      }
+    }
+    event EventHandler<EventArgs<int, int>> IStringConvertibleMatrixData.ItemChanged {
+      add { base.ItemChanged += value; }
+      remove { base.ItemChanged -= value; }
+    }
+    event EventHandler IStringConvertibleMatrixData.Reset {
+      add { base.Reset += value; }
+      remove { base.Reset -= value; }
+    }
+    #endregion
   }
 }

trunk/sources/HeuristicLab.Permutation/3.3/RandomPermutationCreator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2008 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Operators;
+using HeuristicLab.Parameters;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Permutation {
   /// <summary>
-  /// Generates a randomly shuffled permuation.
+  /// An operator which creates a new random permutation of integer values.
   /// </summary>
-  public class RandomPermutationGenerator : OperatorBase {
-    /// <inheritdoc select="summary"/>
-    public override string Description {
-      get { return @"TODO\r\nOperator description still missing ..."; }
+  [Item("RandomPermutationCreator", "An operator which creates a new random permutation of integer values.")]
+  [EmptyStorableClass]
+  [Creatable("Test")]
+  public sealed class RandomPermutationCreator : SingleSuccessorOperator {
+    public LookupParameter<IRandom> RandomParameter {
+      get { return (LookupParameter<IRandom>)Parameters["Random"]; }
+    }
+    public ValueLookupParameter<IntData> LengthParameter {
+      get { return (ValueLookupParameter<IntData>)Parameters["Length"]; }
+    }
+    public LookupParameter<Permutation> PermutationParameter {
+      get { return (LookupParameter<Permutation>)Parameters["Permutation"]; }
     }
 
-    /// <summary>
-    /// Initializes a new instance of <see cref="RandomPermutationGenerator"/> with three variable infos
-    /// (<c>Length</c>, <c>Random</c> and <c>Permutation</c>).
-    /// </summary>
-    public RandomPermutationGenerator()
+    public RandomPermutationCreator()
       : base() {
-      AddVariableInfo(new VariableInfo("Length", "Permutation length", typeof(IntData), VariableKind.In));
-      AddVariableInfo(new VariableInfo("Random", "Pseudo random number generator", typeof(IRandom), VariableKind.In));
-      AddVariableInfo(new VariableInfo("Permutation", "Created random permutation", typeof(Permutation), VariableKind.New));
+      Parameters.Add(new LookupParameter<IRandom>("Random", "The pseudo random number generator which should be used to initialize the new random permutation."));
+      Parameters.Add(new ValueLookupParameter<IntData>("Length", "The length of the new random permutation."));
+      Parameters.Add(new LookupParameter<Permutation>("Permutation", "The new random permutation."));
     }
 
-    /// <summary>
-    /// Generates a randomly shuffled permutation.
-    /// </summary>
-    /// <param name="random">The random number generator.</param>
-    /// <param name="length">The length of the permutation to create.</param>
-    /// <returns>The generated permuation as int array.</returns>
-    public static int[] Apply(IRandom random, int length) {
-      int[] perm = new int[length];
-
-      for (int i = 0; i < length; i++)
-        perm[i] = i;
-
-      // Knuth shuffle
-      int index, tmp;
-      for (int i = 0; i < length - 1; i++) {
-        index = random.Next(i, length);
-        tmp = perm[i];
-        perm[i] = perm[index];
-        perm[index] = tmp;
-      }
-      return perm;
-    }
-
-    /// <summary>
-    /// Generates a randomly shuffled permutation.
-    /// </summary>
-    /// <remarks>Calls <see cref="Apply(HeuristicLab.Core.IRandom, int)"/>.</remarks>
-    /// <param name="scope">The current scope with the variables.</param>
-    /// <returns><c>null</c>.</returns>
-    public override IOperation Apply(IScope scope) {
-      IRandom random = GetVariableValue<IRandom>("Random", scope, true);
-      IntData length = GetVariableValue<IntData>("Length", scope, true);
-
-      int[] perm = Apply(random, length.Data);
-      scope.AddVariable(new Variable(scope.TranslateName("Permutation"), new Permutation(perm)));
-
-      return null;
+    public override IExecutionSequence Apply() {
+      PermutationParameter.ActualValue = new Permutation(LengthParameter.ActualValue.Value, RandomParameter.ActualValue);
+      return base.Apply();
     }
   }

trunk/sources/HeuristicLab.Random/3.3/HeuristicLab.Random-3.3.csproj

@@ -86 +86 @@
   <ItemGroup>
     <None Include="HeuristicLabRandomPlugin.cs.frame" />
-    <Compile Include="RandomInitializer.cs" />
     <Compile Include="HeuristicLabRandomPlugin.cs" />
     <Compile Include="MersenneTwister.cs">
@@ -95 +94 @@
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="RandomCreator.cs" />
   </ItemGroup>
   <ItemGroup>

trunk/sources/HeuristicLab.Random/3.3/HeuristicLabRandomPlugin.cs.frame

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using HeuristicLab.PluginInfrastructure;
 

trunk/sources/HeuristicLab.Random/3.3/MersenneTwister.cs

@@ -33 +33 @@
 
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Xml;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;

trunk/sources/HeuristicLab.Random/3.3/NormalDistributedRandom.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Xml;
-using System.Globalization;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;

trunk/sources/HeuristicLab.Random/3.3/RandomCreator.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -31 +28 @@
 namespace HeuristicLab.Operators {
   /// <summary>
-  /// An operator which initializes a pseudo random number generator.
+  /// An operator which creates a new pseudo random number generator.
   /// </summary>
-  [Item("RandomInitializer", "An operator which initializes a pseudo random number generator.")]
+  [Item("RandomCreator", "An operator which creates a new pseudo random number generator.")]
   [EmptyStorableClass]
   [Creatable("Test")]
-  public sealed class RandomInitializer : SingleSuccessorOperator {
+  public sealed class RandomCreator : SingleSuccessorOperator {
     public ValueLookupParameter<BoolData> SetSeedRandomlyParameter {
       get { return (ValueLookupParameter<BoolData>)Parameters["SetSeedRandomly"]; }
@@ -55 +52 @@
     }
 
-    public RandomInitializer()
+    public RandomCreator()
       : base() {
       Parameters.Add(new ValueLookupParameter<BoolData>("SetSeedRandomly", "True if the random seed should be set to a random value, otherwise false.", new BoolData(true)));
-      Parameters.Add(new ValueLookupParameter<IntData>("Seed", "The random seed used to initialize the pseudo random number generator.", new IntData(0)));
-      Parameters.Add(new LookupParameter<IRandom>("Random", "The pseudo random number generator which should be initialized with the given seed."));
+      Parameters.Add(new ValueLookupParameter<IntData>("Seed", "The random seed used to initialize the new pseudo random number generator.", new IntData(0)));
+      Parameters.Add(new LookupParameter<IRandom>("Random", "The new pseudo random number generator which is initialized with the given seed."));
     }