Context Navigation

← Previous Change
Next Change →

GroupingVector

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/GroupingVector

Files:

: 14 edited

GroupingVectorCrossover.cs (modified) (1 diff)
GroupingVectorDiscreteCrossover.cs (modified) (1 diff)
GroupingVectorEncoding.cs (modified) (1 diff)
GroupingVectorManipulator.cs (modified) (1 diff)
GroupingVectorSinglePointCrossover.cs (modified) (1 diff)
Moves/ChangeGrouping/ChangeGroupingMove.cs (modified) (1 diff)
Moves/ChangeGrouping/ChangeGroupingMoveGenerator.cs (modified) (1 diff)
Moves/GroupingMove.cs (modified) (1 diff)
Moves/GroupingMoveHardTabuCriterion.cs (modified) (1 diff)
Moves/GroupingMoveMaker.cs (modified) (1 diff)
Moves/GroupingMoveSoftTabuCriterion.cs (modified) (1 diff)
Moves/GroupingTabuMaker.cs (modified) (3 diffs)
Moves/SwapGrouping/SwapGroupingMove.cs (modified) (1 diff)
Moves/SwapGrouping/SwapGroupingMoveGenerator.cs (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/GroupingVectorCrossover.cs

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

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/GroupingVectorDiscreteCrossover.cs

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

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/GroupingVectorEncoding.cs

r13613	r14046
28	28	using HeuristicLab.Encodings.IntegerVectorEncoding;
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.GroupingVector {

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/GroupingVectorManipulator.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.GroupingVector {

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/GroupingVectorSinglePointCrossover.cs

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

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/Moves/ChangeGrouping/ChangeGroupingMove.cs

-                      r13032
+                      r14046
 using HeuristicLab.Encodings.IntegerVectorEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.BinPacking.Interfaces;
+using HeuristicLab.Problems.BinPacking;
 namespace HeuristicLab.Encodings.PackingEncoding.GroupingVector {
   [Item("Change Grouping Move", "A move on a grouping vector that is specified by a single group-assignment-index.")]
   [StorableClass]
   public class ChangeGroupingMove : GroupingMove, IPackingMove{
+  public class ChangeGroupingMove : GroupingMove, IPackingMove {
     [Storable]
     public int Index { get; protected set; }

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/Moves/ChangeGrouping/ChangeGroupingMoveGenerator.cs

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

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/Moves/GroupingMove.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.GroupingVector {

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/Moves/GroupingMoveHardTabuCriterion.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.GroupingVector {

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/Moves/GroupingMoveMaker.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.GroupingVector {

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/Moves/GroupingMoveSoftTabuCriterion.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.GroupingVector {

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/Moves/GroupingTabuMaker.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.GroupingVector {
   [Item("Grouping tabu maker", "Declares a given grouping 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 GroupingTabuMaker : TabuMaker, IGroupingVectorMoveOperator{
+  public class GroupingTabuMaker : TabuMaker, IGroupingVectorMoveOperator {
     public ILookupParameter<IPackingMove> PackingMoveParameter {
       get { return (ILookupParameter<IPackingMove>)Parameters["PackingMove"]; }
 …
     public GroupingTabuMaker()
       : 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<GroupingVectorEncoding>("GroupingVector", "The solution to evaluate."));
+    }
 …
     protected override IItem GetTabuAttribute(bool maximization, double quality, double moveQuality) {
       IPackingMove move = PackingMoveParameter.ActualValue;
       GroupingVectorEncoding groupingVector = GroupingVectorParameter.ActualValue;
+      GroupingVectorEncoding groupingVector = GroupingVectorParameter.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/GroupingVector/Moves/SwapGrouping/SwapGroupingMove.cs

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

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/Moves/SwapGrouping/SwapGroupingMoveGenerator.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.GroupingVector {

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

Context Navigation

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

Legend:

Download in other formats: