Changeset 4068 for trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding

Timestamp:

07/22/10 00:44:01 (15 years ago)

Author:

swagner

Message:

Sorted usings and removed unused usings in entire solution (#1094)

Location:

trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3

Files:

• BinaryVectorCreator.cs (modified) (1 diff)
• BinaryVectorCrossover.cs (modified) (1 diff)
• BinaryVectorManipulator.cs (modified) (1 diff)
• Creators/RandomBinaryVectorCreator.cs (modified) (2 diffs)
• Crossovers/NPointCrossover.cs (modified) (4 diffs)
• Crossovers/SinglePointCrossover.cs (modified) (2 diffs)
• Crossovers/UniformCrossover.cs (modified) (3 diffs)
• Interfaces/IBinaryVectorCreator.cs (modified) (1 diff)
• Interfaces/IBinaryVectorCrossover.cs (modified) (1 diff)
• Interfaces/IBinaryVectorManipulator.cs (modified) (1 diff)
• Interfaces/IBinaryVectorMoveOperator.cs (modified) (1 diff)
• Interfaces/IBinaryVectorOperator.cs (modified) (1 diff)
• Interfaces/IOneBitflipMoveOperator.cs (modified) (1 diff)
• Manipulators/SinglePositionBitflipManipulator.cs (modified) (2 diffs)
• Manipulators/SomePositionsBitflipManipulator.cs (modified) (1 diff)
• Moves/OneBitflipMove/ExhaustiveOneBitflipMoveGenerator.cs (modified) (2 diffs)
• Moves/OneBitflipMove/OneBitflipMove.cs (modified) (1 diff)
• Moves/OneBitflipMove/OneBitflipMoveGenerator.cs (modified) (1 diff)
• Moves/OneBitflipMove/OneBitflipMoveMaker.cs (modified) (1 diff)
• Moves/OneBitflipMove/OneBitflipMoveTabuChecker.cs (modified) (2 diffs)
• Moves/OneBitflipMove/OneBitflipMoveTabuMaker.cs (modified) (1 diff)
• Moves/OneBitflipMove/StochasticOneBitflipMultiMoveGenerator.cs (modified) (1 diff)
• Moves/OneBitflipMove/StochasticOneBitflipSingleMoveGenerator.cs (modified) (1 diff)
• Tests/Auxiliary.cs (modified) (1 diff)
• Tests/NPointCrossoverTest.cs (modified) (4 diffs)
• Tests/Properties/AssemblyInfo.cs (modified) (1 diff)
• Tests/SinglePointCrossoverTest.cs (modified) (2 diffs)
• Tests/SinglePositionBitflipManipulatorTest.cs (modified) (1 diff)
• Tests/SomePositionsBitflipManipulatorTest.cs (modified) (1 diff)
• Tests/UniformCrossoverTest.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/BinaryVectorCreator.cs ¶

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;

trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/BinaryVectorCrossover.cs ¶

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Operators;
 using HeuristicLab.Optimization;

trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/BinaryVectorManipulator.cs ¶

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Operators;
 using HeuristicLab.Optimization;

trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Creators/RandomBinaryVectorCreator.cs ¶

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -35 +30 @@
   [Item("RandomBinaryVectorCreator", "An operator which creates a new random binary vector with each element randomly initialized.")]
   [StorableClass]
-  public class RandomBinaryVectorCreator: BinaryVectorCreator {
+  public class RandomBinaryVectorCreator : BinaryVectorCreator {
     /// <summary>
     /// Generates a new random binary vector with the given <paramref name="length"/>.

trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Crossovers/NPointCrossover.cs ¶

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Encodings.BinaryVectorEncoding {
@@ -39 +36 @@
   [Item("NPointCrossover", "N point crossover for binary vectors. It is implemented as described in Eiben, A.E. and Smith, J.E. 2003. Introduction to Evolutionary Computation. Natural Computing Series, Springer-Verlag Berlin Heidelberg.")]
   [StorableClass]
-  public class NPointCrossover: BinaryVectorCrossover {
+  public class NPointCrossover : BinaryVectorCrossover {
     /// <summary>
     /// Number of crossover points.
@@ -80 +77 @@
       //choose break points
       List<int> breakpointPool = new List<int>();
-           
+
       for (int i = 0; i < length; i++)
         breakpointPool.Add(i);
@@ -98 +95 @@
 
       while (arrayIndex < length) {
-        if (breakPointIndex < breakpoints.Length && 
+        if (breakPointIndex < breakpoints.Length &&
           arrayIndex == breakpoints[breakPointIndex]) {
           breakPointIndex++;

trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Crossovers/SinglePointCrossover.cs ¶

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Data;
-using HeuristicLab.Parameters;
 
 namespace HeuristicLab.Encodings.BinaryVectorEncoding {
@@ -39 +34 @@
   [Item("SinglePointCrossover", "Single point crossover for binary vectors. It is implemented based on the NPointCrossover.")]
   [StorableClass]
-  public class SinglePointCrossover: BinaryVectorCrossover {
+  public class SinglePointCrossover : BinaryVectorCrossover {
     /// <summary>
     /// Performs a single point crossover at a randomly chosen position of two 

trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Crossovers/UniformCrossover.cs ¶

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Data;
-using HeuristicLab.Parameters;
 
 namespace HeuristicLab.Encodings.BinaryVectorEncoding {
@@ -39 +33 @@
   [Item("UniformCrossover", "Uniform crossover for binary vectors. It is implemented as described in Eiben, A.E. and Smith, J.E. 2003. Introduction to Evolutionary Computation. Natural Computing Series, Springer-Verlag Berlin Heidelberg.")]
   [StorableClass]
-  public class UniformCrossover: BinaryVectorCrossover {
+  public class UniformCrossover : BinaryVectorCrossover {
     /// <summary>
     /// Performs a uniform crossover between two binary vectors.
@@ -60 +54 @@
           result[i] = parent2[i];
       }
-      
+
       return new BinaryVector(result);
     }

trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Interfaces/IBinaryVectorCreator.cs ¶

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;

trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Interfaces/IBinaryVectorCrossover.cs ¶

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Optimization;
 

trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Interfaces/IBinaryVectorManipulator.cs ¶

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Optimization;
 

trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Interfaces/IBinaryVectorMoveOperator.cs ¶

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;

trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Interfaces/IBinaryVectorOperator.cs ¶

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Common;
 using HeuristicLab.Core;
 

trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Interfaces/IOneBitflipMoveOperator.cs ¶

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Encodings.BinaryVectorEncoding {

trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Manipulators/SinglePositionBitflipManipulator.cs ¶

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -37 +32 @@
   [Item("SinglePositionBitflipManipulator", "Flips exactly one bit of a binary vector. It is implemented as described in Michalewicz, Z. 1999. Genetic Algorithms + Data Structures = Evolution Programs. Third, Revised and Extended Edition, Spring-Verlag Berlin Heidelberg.")]
   [StorableClass]
-  public class SinglePositionBitflipManipulator: BinaryVectorManipulator {
+  public class SinglePositionBitflipManipulator : BinaryVectorManipulator {
     /// <summary>
     /// Performs the single position bitflip mutation on a binary vector.

trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Manipulators/SomePositionsBitflipManipulator.cs ¶

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Encodings.BinaryVectorEncoding {

trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/ExhaustiveOneBitflipMoveGenerator.cs ¶

@@ -20 +20 @@
 #endregion
 
-using System;
-using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Encodings.BinaryVectorEncoding {
@@ -35 +33 @@
       OneBitflipMove[] moves = new OneBitflipMove[totalMoves];
       for (int i = 0; i < length; i++)
-          moves[i] = new OneBitflipMove(i);
+        moves[i] = new OneBitflipMove(i);
 
       return moves;

trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/OneBitflipMove.cs ¶

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;

trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/OneBitflipMoveGenerator.cs ¶

@@ -20 +20 @@
 #endregion
 
-using System;
-using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Operators;

trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/OneBitflipMoveMaker.cs ¶

@@ -20 +20 @@
 #endregion
 
-using System;
-using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;

trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/OneBitflipMoveTabuChecker.cs ¶

@@ -20 +20 @@
 #endregion
 
-using System;
-using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -41 +39 @@
     public ILookupParameter<BinaryVector> BinaryVectorParameter {
       get { return (LookupParameter<BinaryVector>)Parameters["BinaryVector"]; }
-    }      
+    }
     public ILookupParameter<ItemList<IItem>> TabuListParameter {
       get { return (ILookupParameter<ItemList<IItem>>)Parameters["TabuList"]; }

trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/OneBitflipMoveTabuMaker.cs ¶

@@ -20 +20 @@
 #endregion
 
-using System;
-using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
-using HeuristicLab.Operators;
-using HeuristicLab.Optimization;
 using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;

trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/StochasticOneBitflipMultiMoveGenerator.cs ¶

@@ -20 +20 @@
 #endregion
 
-using System;
-using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Operators;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;

trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/StochasticOneBitflipSingleMoveGenerator.cs ¶

@@ -20 +20 @@
 #endregion
 
-using System;
-using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;

trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Tests/Auxiliary.cs ¶

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Common;
 using HeuristicLab.Encodings.BinaryVectorEncoding;
 

trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Tests/NPointCrossoverTest.cs ¶

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Encodings.BinaryVectorEncoding;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using HeuristicLab.Common;
-using HeuristicLab.Core;
-using HeuristicLab.Data;
-using HeuristicLab.Parameters;
 
 namespace HeuristicLab.Encodings.BinaryVectorEncoding_33.Tests {
@@ -112 +110 @@
         BinaryVector actual;
         actual = target.Cross(random, parents);
-      } catch (System.ArgumentException) {
+      }
+      catch (System.ArgumentException) {
         exceptionFired = true;
       }
@@ -136 +135 @@
       actual = NPointCrossover.Apply(random, parent1, parent2, n);
       Assert.IsTrue(Auxiliary.BinaryVectorIsEqualByPosition(actual, expected));
-      
+
       // The following test is based on Eiben, A.E. and Smith, J.E. 2003. Introduction to Evolutionary Computation. Natural Computing Series, Springer-Verlag Berlin Heidelberg, p. 48
       random.Reset();
@@ -165 +164 @@
       try {
         actual = NPointCrossover.Apply(random, parent1, parent2, n);
-      } catch (System.ArgumentException) {
+      }
+      catch (System.ArgumentException) {
         exceptionFired = true;
       }

trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Tests/Properties/AssemblyInfo.cs ¶

@@ -21 +21 @@
 
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 

trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Tests/SinglePointCrossoverTest.cs ¶

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Core;
 using HeuristicLab.Encodings.BinaryVectorEncoding;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using HeuristicLab.Common;
-using HeuristicLab.Core;
-using HeuristicLab.Data;
-using HeuristicLab.Parameters;
 
 namespace HeuristicLab.Encodings.BinaryVectorEncoding_33.Tests {
@@ -112 +109 @@
         BinaryVector actual;
         actual = target.Cross(random, parents);
-      } catch (System.ArgumentException) {
+      }
+      catch (System.ArgumentException) {
         exceptionFired = true;
       }

trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Tests/SinglePositionBitflipManipulatorTest.cs ¶

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Encodings.BinaryVectorEncoding;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using HeuristicLab.Encodings.BinaryVectorEncoding;
-using HeuristicLab.Data;
 
 namespace HeuristicLab.Encodings.BinaryVectorEncoding_33.Tests {

trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Tests/SomePositionsBitflipManipulatorTest.cs ¶

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Data;
+using HeuristicLab.Encodings.BinaryVectorEncoding;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using HeuristicLab.Encodings.BinaryVectorEncoding;
-using HeuristicLab.Data;
 
 namespace HeuristicLab.Encodings.BinaryVectorEncoding_33.Tests {

trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Tests/UniformCrossoverTest.cs ¶

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Core;
 using HeuristicLab.Encodings.BinaryVectorEncoding;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using HeuristicLab.Common;
-using HeuristicLab.Core;
-using HeuristicLab.Data;
-using HeuristicLab.Parameters;
 
 namespace HeuristicLab.Encodings.BinaryVectorEncoding_33.Tests {
@@ -112 +109 @@
         BinaryVector actual;
         actual = target.Cross(random, parents);
-      } catch (System.ArgumentException) {
+      }
+      catch (System.ArgumentException) {
         exceptionFired = true;
       }
@@ -131 +129 @@
       parent1 = new BinaryVector(new bool[] { false, false, false, false, true, false, false, false, false });
       parent2 = new BinaryVector(new bool[] { true, true, false, true, false, false, false, false, true });
-      expected = new BinaryVector(new bool[] { false, true, false, false, false, false, false, false, false});
+      expected = new BinaryVector(new bool[] { false, true, false, false, false, false, false, false, false });
       actual = UniformCrossover.Apply(random, parent1, parent2);
       Assert.IsTrue(Auxiliary.BinaryVectorIsEqualByPosition(actual, expected));
@@ -143 +141 @@
       actual = UniformCrossover.Apply(random, parent1, parent2);
       Assert.IsTrue(Auxiliary.BinaryVectorIsEqualByPosition(actual, expected));
-      
+
       // The following test is not based on any published examples
       random.Reset();
@@ -152 +150 @@
       try {
         actual = UniformCrossover.Apply(random, parent1, parent2);
-      } catch (System.ArgumentException) {
+      }
+      catch (System.ArgumentException) {
         exceptionFired = true;
       }