Context Navigation

← Previous Change
Next Change →

PackingSequence

Timestamp:

07/12/16 19:34:31 (8 years ago)

Author:

gkronber

Message:

#1966: unified namespaces

Location:

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence

Files:

: 16 edited

Moves/GroupingMoveHardTabuCriterion.cs (modified) (2 diffs)
Moves/GroupingMoveMaker.cs (modified) (1 diff)
Moves/GroupingMoveSoftTabuCriterion.cs (modified) (1 diff)
Moves/Insertion/InsertionMove.cs (modified) (3 diffs)
Moves/Insertion/InsertionMoveGenerator.cs (modified) (1 diff)
Moves/SequenceMove.cs (modified) (1 diff)
Moves/SequenceTabuMaker.cs (modified) (3 diffs)
Moves/Swap2/Swap2Move.cs (modified) (1 diff)
Moves/Swap2/Swap2MoveGenerator.cs (modified) (1 diff)
PackingSequenceCrossover.cs (modified) (1 diff)
PackingSequenceEncoding.cs (modified) (1 diff)
PackingSequenceInversionManipulator.cs (modified) (1 diff)
PackingSequenceManipulator.cs (modified) (2 diffs)
PackingSequenceOrderCrossover.cs (modified) (2 diffs)
PackingSequencePartiallyMatchedCrossover.cs (modified) (2 diffs)
PackingSequenceScrambleManipulator.cs (modified) (3 diffs)

Legend:

: Unmodified
: Added
: Removed

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/Moves/GroupingMoveHardTabuCriterion.cs

-                      r13032
+                      r14046
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.BinPacking.Interfaces;
+using HeuristicLab.Problems.BinPacking;
 namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {
 …
       int length = PackingSequence.PackingSequence.Length;
       double moveQuality = MoveQualityParameter.ActualValue.Value;
       bool maximization = MaximizationParameter.ActualValue.Value;
+      bool maximization = MaximizationParameter.ActualValue.Value;
       bool useAspiration = UseAspirationCriterionParameter.Value.Value;
       bool isTabu = IsMoveTabu(tabuList, move, PackingSequence, moveQuality, maximization, useAspiration);

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/Moves/GroupingMoveMaker.cs

r13032	r14046
28	28	using HeuristicLab.Parameters;
29	29	using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
30		using HeuristicLab.Problems.BinPacking~~.Interfaces~~;
	30	using HeuristicLab.Problems.BinPacking;
31	31
32	32	namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/Moves/GroupingMoveSoftTabuCriterion.cs

-                      r13032
+                      r14046
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Problems.BinPacking.Interfaces;
+using HeuristicLab.Problems.BinPacking;
 namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/Moves/Insertion/InsertionMove.cs

-                      r13032
+                      r14046
 using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Problems.BinPacking.Interfaces;
+using HeuristicLab.Problems.BinPacking;
 namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {
 …
         } else
           if (Index1 == attr.Index1 && Index2 == attr.Index2)
             return true;
+          return true;
+      }
       return false;
 …
     public override string ToString() {
       return "IM(i1="+Index1 + ", i2=" + Index2  +")";
+      return "IM(i1=" + Index1 + ", i2=" + Index2 + ")";
+    }
+  }

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/Moves/Insertion/InsertionMoveGenerator.cs

-                      r13032
+                      r14046
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Problems.BinPacking.Interfaces;
+using HeuristicLab.Problems.BinPacking;
 namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/Moves/SequenceMove.cs

r13032	r14046
25	25	using HeuristicLab.Core;
26	26	using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
27		using HeuristicLab.Problems.BinPacking~~.Interfaces~~;
	27	using HeuristicLab.Problems.BinPacking;
28	28
29	29	namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/Moves/SequenceTabuMaker.cs

-                      r13032
+                      r14046
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.BinPacking.Interfaces;
+using HeuristicLab.Problems.BinPacking;
 namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {
   [Item("Sequence tabu maker", "Declares a given Sequence move as tabu, by adding its attributes to the tabu list and also store the solution quality or the move quality (whichever is better).")]
   [StorableClass]
   public class SequenceTabuMaker : TabuMaker, IPackingSequenceMoveOperator{
+  public class SequenceTabuMaker : TabuMaker, IPackingSequenceMoveOperator {
     public ILookupParameter<IPackingMove> PackingMoveParameter {
       get { return (ILookupParameter<IPackingMove>)Parameters["PackingMove"]; }
 …
     public SequenceTabuMaker()
       : base() {
         Parameters.Add(new LookupParameter<IPackingMove>("PackingMove", "The move to evaluate."));
+      Parameters.Add(new LookupParameter<IPackingMove>("PackingMove", "The move to evaluate."));
       Parameters.Add(new LookupParameter<PackingSequenceEncoding>("PackingSequence", "The solution to evaluate."));
+    }
 …
     protected override IItem GetTabuAttribute(bool maximization, double quality, double moveQuality) {
       IPackingMove move = PackingMoveParameter.ActualValue;
       PackingSequenceEncoding PackingSequence = PackingSequenceParameter.ActualValue;
+      PackingSequenceEncoding PackingSequence = PackingSequenceParameter.ActualValue;
       double baseQuality = moveQuality;
       if (maximization && quality > moveQuality || !maximization && quality < moveQuality)
+      if (maximization && quality > moveQuality || !maximization && quality < moveQuality)
         baseQuality = quality; // we make an uphill move, the lower bound is the solution quality

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/Moves/Swap2/Swap2Move.cs

-                      r13032
+                      r14046
 using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Problems.BinPacking.Interfaces;
+using HeuristicLab.Problems.BinPacking;
 namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/Moves/Swap2/Swap2MoveGenerator.cs

r13032	r14046
27	27	using HeuristicLab.Parameters;
28	28	using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
29		using HeuristicLab.Problems.BinPacking~~.Interfaces~~;
	29	using HeuristicLab.Problems.BinPacking;
30	30
31	31	namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/PackingSequenceCrossover.cs

r13032	r14046
24	24	using HeuristicLab.Core;
25	25	using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
26		using HeuristicLab.Problems.BinPacking~~.Interfaces~~;
	26	using HeuristicLab.Problems.BinPacking;
27	27
28	28	namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/PackingSequenceEncoding.cs

-                      r14038
+                      r14046
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.PermutationEncoding;
-using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Problems.BinPacking.Interfaces;
+using HeuristicLab.Problems.BinPacking;
 namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/PackingSequenceInversionManipulator.cs

-                      r13461
+                      r14046
 using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Problems.BinPacking.Interfaces;
+using HeuristicLab.Problems.BinPacking;
 namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/PackingSequenceManipulator.cs

-                      r13032
+                      r14046
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.BinPacking.Interfaces;
+using HeuristicLab.Problems.BinPacking;
 namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {
 …
     public PackingSequenceManipulator()
       : base() {
         EncodedSolutionParameter.ActualName = "PackingSequence";
+      EncodedSolutionParameter.ActualName = "PackingSequence";
+    }

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/PackingSequenceOrderCrossover.cs

-                      r13032
+                      r14046
 using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.BinPacking.Interfaces;
+using HeuristicLab.Problems.BinPacking;
 namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {
 …
+    }
     public override PackingSequenceEncoding Cross(IRandom random, PackingSequenceEncoding parent1, PackingSequenceEncoding parent2)  {
+    public override PackingSequenceEncoding Cross(IRandom random, PackingSequenceEncoding parent1, PackingSequenceEncoding parent2) {
       PackingSequenceEncoding result = new PackingSequenceEncoding();
       result.PackingSequence = OrderCrossover.Apply(random, parent1.PackingSequence, parent2.PackingSequence);

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/PackingSequencePartiallyMatchedCrossover.cs

-                      r13032
+                      r14046
 using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Problems.BinPacking.Interfaces;
+using HeuristicLab.Problems.BinPacking;
 namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {
 …
+    }
     public override PackingSequenceEncoding Cross(IRandom random, PackingSequenceEncoding parent1, PackingSequenceEncoding parent2)  {
+    public override PackingSequenceEncoding Cross(IRandom random, PackingSequenceEncoding parent1, PackingSequenceEncoding parent2) {
       PackingSequenceEncoding result = new PackingSequenceEncoding();
       result.PackingSequence = PartiallyMatchedCrossover.Apply(random, parent1.PackingSequence, parent2.PackingSequence);

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/PackingSequenceScrambleManipulator.cs

-                      r13461
+                      r14046
 using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.BinPacking.Interfaces;
+using HeuristicLab.Problems.BinPacking;
 namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {
 …
     public PackingSequenceScrambleManipulator()
       : base() {
         EncodedSolutionParameter.ActualName = "PackingSequence";
+      EncodedSolutionParameter.ActualName = "PackingSequence";
+    }
     public override IDeepCloneable Clone(Cloner cloner) {
 …
     protected override void Manipulate(IRandom random, PackingSequenceEncoding individual) {
       ScrambleManipulator.Apply(random, individual.PackingSequence);
+    }
+    }
+  }
+}

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 14046 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence

Legend:

Download in other formats: