Context Navigation

HeuristicLab.Encodings.PermutationEncoding

Timestamp:

02/10/15 09:57:29 (10 years ago)

Author:

pfleck

Message:

#2269 merged trunk

Location:

branches/ALPS

Files:

Property svn:mergeinfo changed

/branches/CodeEditor (added)	merged: 11700-11701,11707,11722,11738,11741,11743,11765,11785,11800,11802,11804-11805
/trunk/sources	merged: 11679-11680,11703-11705,11715,11717,11721,11723-11725,11734-11736,11756-11758,11762-11763,11766,11771-11772,11781-11782,11784,11787-11790,11794,11807,11809-11811,11815-11816,11818-11819,11822,11825-11831,11833-11837,11839-11840,11854,11856,11877-11879,11882,11890,11909,11912-11916,11918,11921,11930,11933-11934,11936,11938-11939,11942,11945,11948,11950-11951,11955-11956,11958-11961,11963,11967,11970-11971

Property svn:mergeinfo changed

/branches/ProgrammableProblem/HeuristicLab.Encodings.PermutationEncoding (added)	merged: 11776,11778,11946,11949,11952
/trunk/sources/HeuristicLab.Encodings.PermutationEncoding	merged: 11961,11970

r11677	r11975
193	193	<Compile Include="Moves\TwoOpt\StochasticInversionMultiMoveGenerator.cs" />
194	194	<Compile Include="Moves\TwoOpt\StochasticInversionSingleMoveGenerator.cs" />
	195	<Compile Include="PermutationEncoding.cs" />
195	196	<Compile Include="PermutationEqualityComparer.cs" />
196	197	<Compile Include="PermutationManipulator.cs" />

r11171	r11975
31	31	[Item("ScrambleMoveMaker", "Peforms a scramble move on a given permutation and updates the quality.")]
32	32	[StorableClass]
33		public class ScrambleMoveMaker : SingleSuccessorOperator, IPermutationScrambleMoveOperator, IMoveMaker {
	33	public class ScrambleMoveMaker : SingleSuccessorOperator, IPermutationScrambleMoveOperator, IMoveMaker, ISingleObjectiveOperator {
34	34	public override bool CanChangeName {
35	35	get { return false; }

r11171	r11975
31	31	[Item("Swap2MoveMaker", "Peforms a swap-2 move on a given permutation and updates the quality.")]
32	32	[StorableClass]
33		public class Swap2MoveMaker : SingleSuccessorOperator, IPermutationSwap2MoveOperator, IMoveMaker {
	33	public class Swap2MoveMaker : SingleSuccessorOperator, IPermutationSwap2MoveOperator, IMoveMaker, ISingleObjectiveOperator {
34	34	public override bool CanChangeName {
35	35	get { return false; }

r11171	r11975
31	31	[Item("TranslocationMoveMaker", "Peforms a translocation or insertion move (3-opt) on a given permutation and updates the quality.")]
32	32	[StorableClass]
33		public class TranslocationMoveMaker : SingleSuccessorOperator, IPermutationTranslocationMoveOperator, IMoveMaker {
	33	public class TranslocationMoveMaker : SingleSuccessorOperator, IPermutationTranslocationMoveOperator, IMoveMaker, ISingleObjectiveOperator {
34	34	public override bool CanChangeName {
35	35	get { return false; }

r11171	r11975
31	31	[Item("InversionMoveMaker", "Peforms an inversion move (2-opt) on a given permutation and updates the quality.")]
32	32	[StorableClass]
33		public class InversionMoveMaker : SingleSuccessorOperator, IPermutationInversionMoveOperator, IMoveMaker {
	33	public class InversionMoveMaker : SingleSuccessorOperator, IPermutationInversionMoveOperator, IMoveMaker, ISingleObjectiveOperator {
34	34	public override bool CanChangeName {
35	35	get { return false; }

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