Context Navigation

← Previous Change
Next Change →

HeuristicLab.Operators

Timestamp:

08/29/19 15:57:35 (5 years ago)

Author:

mkommend

Message:

#2521: Merged trunk changes into problem refactoring branch.

Location:

branches/2521_ProblemRefactoring

Files:

: 34 edited

. (modified) (1 prop)
HeuristicLab.Operators/3.3/AlgorithmOperator.cs (modified) (1 diff)
HeuristicLab.Operators/3.3/Assigner.cs (modified) (1 diff)
HeuristicLab.Operators/3.3/CheckedMultiOperator.cs (modified) (1 diff)
HeuristicLab.Operators/3.3/CombinedOperator.cs (modified) (1 diff)
HeuristicLab.Operators/3.3/Comparator.cs (modified) (1 diff)
HeuristicLab.Operators/3.3/ConditionalBranch.cs (modified) (1 diff)
HeuristicLab.Operators/3.3/DataReducer.cs (modified) (1 diff)
HeuristicLab.Operators/3.3/DoubleCounter.cs (modified) (1 diff)
HeuristicLab.Operators/3.3/EmptyOperator.cs (modified) (1 diff)
HeuristicLab.Operators/3.3/InstrumentedOperator.cs (modified) (1 diff)
HeuristicLab.Operators/3.3/IntCounter.cs (modified) (1 diff)
HeuristicLab.Operators/3.3/LocalRandomCreator.cs (modified) (1 diff)
HeuristicLab.Operators/3.3/MultiOperator.cs (modified) (1 diff)
HeuristicLab.Operators/3.3/Operator.InstrumentedOperatorWrapper.cs (modified) (1 diff)
HeuristicLab.Operators/3.3/Operator.cs (modified) (1 diff)
HeuristicLab.Operators/3.3/Placeholder.cs (modified) (1 diff)
HeuristicLab.Operators/3.3/Plugin.cs.frame (modified) (2 diffs)
HeuristicLab.Operators/3.3/Properties/AssemblyInfo.cs.frame (modified) (3 diffs)
HeuristicLab.Operators/3.3/ReductionOperation.cs (modified) (1 diff)
HeuristicLab.Operators/3.3/ScopeCleaner.cs (modified) (1 diff)
HeuristicLab.Operators/3.3/SingleSuccessorOperator.cs (modified) (1 diff)
HeuristicLab.Operators/3.3/StochasticBranch.cs (modified) (1 diff)
HeuristicLab.Operators/3.3/StochasticMultiBranch.cs (modified) (1 diff)
HeuristicLab.Operators/3.3/SubScopesCloner.cs (modified) (1 diff)
HeuristicLab.Operators/3.3/SubScopesCounter.cs (modified) (1 diff)
HeuristicLab.Operators/3.3/SubScopesCreator.cs (modified) (1 diff)
HeuristicLab.Operators/3.3/SubScopesMixer.cs (modified) (1 diff)
HeuristicLab.Operators/3.3/SubScopesProcessor.cs (modified) (1 diff)
HeuristicLab.Operators/3.3/SubScopesRemover.cs (modified) (1 diff)
HeuristicLab.Operators/3.3/SubScopesSorter.cs (modified) (1 diff)
HeuristicLab.Operators/3.3/UniformSubScopesProcessor.cs (modified) (1 diff)
HeuristicLab.Operators/3.3/ValuesCollector.cs (modified) (1 diff)
HeuristicLab.Operators/3.3/VariableCreator.cs (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/2521_ProblemRefactoring

Property svn:mergeinfo changed

/branches/2435-alglib_3_15 (added)	merged: 16683-16684,17034,17036
/trunk	merged: 16978-16983,16992,16997,17007-17009,17014-17016,17019-17024,17028,17030,17032-17033,17037,17043-17044,17048,17052,17076-17089,17092-17095,17110,17118,17121,17125-17128,17132,17137,17139,17150,17154,17179-17180,17182-17185,17191,17198,17220-17223

branches/2521_ProblemRefactoring/HeuristicLab.Operators/3.3/AlgorithmOperator.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Operators/3.3/Assigner.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Operators/3.3/CheckedMultiOperator.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Operators/3.3/CombinedOperator.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Operators/3.3/Comparator.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Operators/3.3/ConditionalBranch.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Operators/3.3/DataReducer.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Operators/3.3/DoubleCounter.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Operators/3.3/EmptyOperator.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Operators/3.3/InstrumentedOperator.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Operators/3.3/IntCounter.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Operators/3.3/LocalRandomCreator.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Operators/3.3/MultiOperator.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Operators/3.3/Operator.InstrumentedOperatorWrapper.cs

r16723	r17226
2	2
3	3	/* HeuristicLab
4		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	4	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
5	5	*
6	6	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Operators/3.3/Operator.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Operators/3.3/Placeholder.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Operators/3.3/Plugin.cs.frame

-                      r16723
+                      r17226
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
   /// Plugin class for HeuristicLab.Operators plugin.
   /// </summary>
   [Plugin("HeuristicLab.Operators", "3.3.15.$WCREV$")]
+  [Plugin("HeuristicLab.Operators", "3.3.16.$WCREV$")]
   [PluginFile("HeuristicLab.Operators-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Collections", "3.3")]

branches/2521_ProblemRefactoring/HeuristicLab.Operators/3.3/Properties/AssemblyInfo.cs.frame

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

branches/2521_ProblemRefactoring/HeuristicLab.Operators/3.3/ReductionOperation.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Operators/3.3/ScopeCleaner.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Operators/3.3/SingleSuccessorOperator.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Operators/3.3/StochasticBranch.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Operators/3.3/StochasticMultiBranch.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Operators/3.3/SubScopesCloner.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Operators/3.3/SubScopesCounter.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Operators/3.3/SubScopesCreator.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Operators/3.3/SubScopesMixer.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Operators/3.3/SubScopesProcessor.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Operators/3.3/SubScopesRemover.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Operators/3.3/SubScopesSorter.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Operators/3.3/UniformSubScopesProcessor.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Operators/3.3/ValuesCollector.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Operators/3.3/VariableCreator.cs

r16723	r17226
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 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 17226 for branches/2521_ProblemRefactoring/HeuristicLab.Operators

Legend:

Download in other formats: