Context Navigation

HeuristicLab.Problems.QuadraticAssignment

Timestamp:

08/11/15 10:11:47 (9 years ago)

Author:

ascheibe

Message:

#2388 merged trunk into branch

Location:

branches/HiveStatistics/sources

Files:

Property svn:ignore

Property svn:mergeinfo changed

/branches/HeuristicLab.Problems.Orienteering (added)	merged: 11130,11132-11134,11136,11185-11195,11226,11228,11235-11237,11240,11242,11245,11247,11258,11260-11261,11264-11270,11275-11277,11284,11289,11293,11299,11301,11303-11305,11307,11311-11312,11314,11316,11319-11323,11325,11327-11329,11413,12694,12721
/stable	merged: 12751-12752
/trunk/sources	merged: 12690,12692,12695,12700-12701,12710,12714-12716,12720,12722,12724,12728,12731,12743-12744,12753,12755,12770,12772,12787,12790-12795,12797-12798,12801,12810-12812,12816-12817,12819,12835-12837,12839

Property svn:mergeinfo changed

/branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.QuadraticAssignment (added)	merged: 11185,11303,12694
/stable/HeuristicLab.Problems.QuadraticAssignment	merged: 12751
/trunk/sources/HeuristicLab.Problems.QuadraticAssignment	merged: 12722,12753,12811

r12012	r12843
108	108	}
109	109	}
110		evaluatedSolutions.Value = (int)Math.Ceiling(evaluations);
	110	evaluatedSolutions.Value += (int)Math.Ceiling(evaluations);
111	111	if (bestMove == null) break;
112	112	InversionManipulator.Apply(assignment, bestMove.Index1, bestMove.Index2);

r12012	r12843
119	119	}
120	120	}
121		evaluatedSolutions.Value = (int)Math.Ceiling(evaluations);
	121	evaluatedSolutions.Value += (int)Math.Ceiling(evaluations);
122	122	if (bestMove == null) break;
123	123	ScrambleManipulator.Apply(assignment, bestMove.StartIndex, bestMove.ScrambledIndices);

r12012	r12843
23	23
24	24	namespace HeuristicLab.Problems.QuadraticAssignment {
25		[Plugin("HeuristicLab.Problems.QuadraticAssignment", "3.3.11.$WCREV$")]
	25	[Plugin("HeuristicLab.Problems.QuadraticAssignment", "3.3.12.$WCREV$")]
26	26	[PluginFile("HeuristicLab.Problems.QuadraticAssignment-3.3.dll", PluginFileType.Assembly)]
27	27	[PluginDependency("HeuristicLab.Analysis", "3.3")]

r12012	r12843
55	55	// [assembly: AssemblyVersion("1.0.*")]
56	56	[assembly: AssemblyVersion("3.3.0.0")]
57		[assembly: AssemblyFileVersion("3.3.11.$WCREV$")]
	57	[assembly: AssemblyFileVersion("3.3.12.$WCREV$")]

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