Context Navigation

← Previous Change
Next Change →

HeuristicLab.Problems.Orienteering

Timestamp:

11/20/18 15:26:57 (6 years ago)

Author:

pfleck

Message:

#2845 Merged trunk changes into branch (15406-15681, 15683-16308)

Location:

branches/2845_EnhancedProgress

Files:

: 14 edited

. (modified) (1 prop)
HeuristicLab.Problems.Orienteering/3.3/Analyzers/BestOrienteeringSolutionAnalyzer.cs (modified) (1 diff)
HeuristicLab.Problems.Orienteering/3.3/Creators/GreedyOrienteeringTourCreator.cs (modified) (1 diff)
HeuristicLab.Problems.Orienteering/3.3/DistanceMatrix.cs (modified) (1 diff)
HeuristicLab.Problems.Orienteering/3.3/Evaluators/OrienteeringEvaluator.cs (modified) (1 diff)
HeuristicLab.Problems.Orienteering/3.3/Improvers/OrienteeringLocalImprovementOperator.cs (modified) (1 diff)
HeuristicLab.Problems.Orienteering/3.3/Interfaces/IOrienteeringEvaluator.cs (modified) (1 diff)
HeuristicLab.Problems.Orienteering/3.3/Interfaces/IOrienteeringSolutionCreator.cs (modified) (1 diff)
HeuristicLab.Problems.Orienteering/3.3/OrienteeringEvaluationResult.cs (modified) (1 diff)
HeuristicLab.Problems.Orienteering/3.3/OrienteeringProblem.cs (modified) (1 diff)
HeuristicLab.Problems.Orienteering/3.3/OrienteeringSolution.cs (modified) (1 diff)
HeuristicLab.Problems.Orienteering/3.3/Plugin.cs.frame (modified) (2 diffs)
HeuristicLab.Problems.Orienteering/3.3/Properties/AssemblyInfo.cs.frame (modified) (3 diffs)
HeuristicLab.Problems.Orienteering/3.3/Shakers/OrienteeringShakingOperator.cs (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/2845_EnhancedProgress

Property svn:mergeinfo changed

/branches/2839_HiveProjectManagement (added)	merged: 15761,15767-15768,15777,15792,15813,15819,15908,15913-15914,15920,15922,15925,15933,15953-15956,15966,15969,15978,15992,15995,16040,16043-16044,16050,16057,16060,16062,16064,16066,16068,16072,16089,16091-16095,16116
/branches/2916_IndexedDataTableSerialization (added)	merged: 15918
/branches/HiveProjectManagement (added)	merged: 15377-15380,15399,15401,15411-15412,15422,15496-15497,15500,15503,15508,15523,15526-15528,15530,15540,15546-15547,15552,15557,15559,15567,15576-15577,15580,15627-15628,15630,15641-15644,15658-15659,15666,15671,15715-15716,15737,15742,15760
/stable	merged: 15587-15588
/trunk (added)	merged: 15706-15708,15727-15730,15738-15739,15751-15755,15766,15769,15782-15783,15785-15787,15789-15790,15793,15796-15799,15802,15810,15818,15829,15839,15845,15853-15855,15869,15871,15882,15891,15902,15931-15932,15934,15940,15951-15952,15972,15983,15998-15999,16015,16021,16023-16025,16032-16033,16054,16059,16063,16071,16084-16086,16117-16118,16120,16122,16168-16169,16177,16179,16184-16187,16202-16209,16211,16213,16216,16218-16219,16221,16223-16224,16232,16241-16244,16252,16255,16257-16261,16263-16264,16266-16267,16269-16274,16276-16280,16283-16287,16289-16294,16296-16298,16301-16302,16305
/trunk/sources (added)	merged: 15408-15409,15419,15427,15447-15448,15452,15461,15464,15478,15480-15481,15483,15486,15498-15499,15502,15505,15513,15517-15518,15532,15534,15545,15548,15551,15556,15560,15566,15581,15583,15589-15591,15594,15596,15598,15607,15610-15611,15619,15621-15623,15626,15637-15638,15645,15665,15667,15672-15674

branches/2845_EnhancedProgress/HeuristicLab.Problems.Orienteering/3.3/Analyzers/BestOrienteeringSolutionAnalyzer.cs

r16308	r16311
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2845_EnhancedProgress/HeuristicLab.Problems.Orienteering/3.3/Creators/GreedyOrienteeringTourCreator.cs

r16308	r16311
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2845_EnhancedProgress/HeuristicLab.Problems.Orienteering/3.3/DistanceMatrix.cs

r16308	r16311
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2845_EnhancedProgress/HeuristicLab.Problems.Orienteering/3.3/Evaluators/OrienteeringEvaluator.cs

r16308	r16311
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2845_EnhancedProgress/HeuristicLab.Problems.Orienteering/3.3/Improvers/OrienteeringLocalImprovementOperator.cs

r16308	r16311
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2845_EnhancedProgress/HeuristicLab.Problems.Orienteering/3.3/Interfaces/IOrienteeringEvaluator.cs

r16308	r16311
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2845_EnhancedProgress/HeuristicLab.Problems.Orienteering/3.3/Interfaces/IOrienteeringSolutionCreator.cs

r16308	r16311
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2845_EnhancedProgress/HeuristicLab.Problems.Orienteering/3.3/OrienteeringEvaluationResult.cs

r16308	r16311
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2845_EnhancedProgress/HeuristicLab.Problems.Orienteering/3.3/OrienteeringProblem.cs

r16308	r16311
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2845_EnhancedProgress/HeuristicLab.Problems.Orienteering/3.3/OrienteeringSolution.cs

r16308	r16311
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2845_EnhancedProgress/HeuristicLab.Problems.Orienteering/3.3/Plugin.cs.frame

-                      r16308
+                      r16311
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
   /// Plugin class for HeuristicLab.Problems.Orienteering.
   /// </summary>
   [Plugin("HeuristicLab.Problems.Orienteering", "3.3.14.$WCREV$")]
+  [Plugin("HeuristicLab.Problems.Orienteering", "3.3.15.$WCREV$")]
   [PluginFile("HeuristicLab.Problems.Orienteering-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Analysis", "3.3")]

branches/2845_EnhancedProgress/HeuristicLab.Problems.Orienteering/3.3/Properties/AssemblyInfo.cs.frame

-                      r16308
+                      r16311
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HeuristicLab")]
 [assembly: AssemblyCopyright("(c) 2002-2016 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2018 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 …
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.3.0.0")]
 [assembly: AssemblyFileVersion("3.3.14.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.15.$WCREV$")]

branches/2845_EnhancedProgress/HeuristicLab.Problems.Orienteering/3.3/Shakers/OrienteeringShakingOperator.cs

r16308	r16311
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

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

Context Navigation

Changeset 16311 for branches/2845_EnhancedProgress/HeuristicLab.Problems.Orienteering

Legend:

Download in other formats: