Context Navigation

← Previous Change
Next Change →

Moves

Timestamp:

02/18/15 10:54:32 (10 years ago)

Author:

bburlacu

Message:

#2276: Merged trunk changes.

Location:

branches/HeuristicLab.DatasetRefactor/sources

Files:

: 10 edited

. (modified) (1 prop)
HeuristicLab.Encodings.RealVectorEncoding (modified) (1 prop)
HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves/AdditiveMove.cs (modified) (1 diff)
HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves/AdditiveMoveGenerator.cs (modified) (1 diff)
HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves/AdditiveMoveMaker.cs (modified) (2 diffs)
HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves/AdditiveMoveTabuAttribute.cs (modified) (1 diff)
HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves/AdditiveMoveTabuChecker.cs (modified) (1 diff)
HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves/AdditiveMoveTabuMaker.cs (modified) (1 diff)
HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves/StochasticNormalMultiMoveGenerator.cs (modified) (1 diff)
HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves/StochasticPolynomialMultiMoveGenerator.cs (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/HeuristicLab.DatasetRefactor/sources

Property svn:mergeinfo changed

/branches/CodeEditor (added)	merged: 11700-11701,11707,11722,11738,11741,11743,11765,11785,11800,11802,11804-11805
/stable	merged: 12008-12010
/trunk/sources (added)	merged: 11581,11592,11596-11597,11599-11600,11605,11608,11610,11615-11616,11618,11623,11631,11634,11650-11652,11657,11675,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,11978,11982-11984,11987-11994,11996,11998-12004,12012,12015-12016,12019,12022

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Encodings.RealVectorEncoding

Property svn:mergeinfo set to (toggle deleted branches)

/branches/HLScript/HeuristicLab.Encodings.RealVectorEncoding	merged	eligible
/stable/HeuristicLab.Encodings.RealVectorEncoding	merged	eligible
/trunk/sources/HeuristicLab.Encodings.RealVectorEncoding	merged	eligible
/branches/1721-RandomForestPersistence/HeuristicLab.Encodings.RealVectorEncoding	10321-10322
/branches/Algorithms.GradientDescent/HeuristicLab.Encodings.RealVectorEncoding	5516-5520
/branches/Benchmarking/sources/HeuristicLab.Encodings.RealVectorEncoding	6917-7005
/branches/CloningRefactoring/HeuristicLab.Encodings.RealVectorEncoding	4656-4721
/branches/CodeEditor/HeuristicLab.Encodings.RealVectorEncoding	11700-11806
/branches/DataAnalysis Refactoring/HeuristicLab.Encodings.RealVectorEncoding	5471-5808
/branches/DataAnalysis SolutionEnsembles/HeuristicLab.Encodings.RealVectorEncoding	5815-6180
/branches/DataAnalysis/HeuristicLab.Encodings.RealVectorEncoding	4458-4459,4462,4464
/branches/DataPreprocessing/HeuristicLab.Encodings.RealVectorEncoding	10085-11101
/branches/GP.Grammar.Editor/HeuristicLab.Encodings.RealVectorEncoding	6284-6795
/branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Encodings.RealVectorEncoding	5060
/branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Encodings.RealVectorEncoding	6123-9799
/branches/LogResidualEvaluator/HeuristicLab.Encodings.RealVectorEncoding	10202-10483
/branches/NET40/sources/HeuristicLab.Encodings.RealVectorEncoding	5138-5162
/branches/ParallelEngine/HeuristicLab.Encodings.RealVectorEncoding	5175-5192
/branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Encodings.RealVectorEncoding	7568-7810
/branches/ProgrammableProblem/HeuristicLab.Encodings.RealVectorEncoding	11777-11959
/branches/QAPAlgorithms/HeuristicLab.Encodings.RealVectorEncoding	6350-6627
/branches/Restructure trunk solution/HeuristicLab.Encodings.RealVectorEncoding	6828
/branches/RuntimeOptimizer/HeuristicLab.Encodings.RealVectorEncoding	8943-9078
/branches/ScatterSearch (trunk integration)/HeuristicLab.Encodings.RealVectorEncoding	7787-8333
/branches/SlaveShutdown/HeuristicLab.Encodings.RealVectorEncoding	8944-8956
/branches/SpectralKernelForGaussianProcesses/HeuristicLab.Encodings.RealVectorEncoding	10204-10479
/branches/SuccessProgressAnalysis/HeuristicLab.Encodings.RealVectorEncoding	5370-5682
/branches/Trunk/HeuristicLab.Encodings.RealVectorEncoding	6829-6865
/branches/UnloadJobs/HeuristicLab.Encodings.RealVectorEncoding	9168-9215
/branches/VNS/HeuristicLab.Encodings.RealVectorEncoding	5594-5752
/branches/histogram/HeuristicLab.Encodings.RealVectorEncoding	5959-6341

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves/AdditiveMove.cs

r11171	r12031
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves/AdditiveMoveGenerator.cs

r11171	r12031
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves/AdditiveMoveMaker.cs

-                      r11171
+                      r12031
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
   [Item("AdditiveMoveMaker", "Peforms an additive move on a given real vector and updates the quality.")]
   [StorableClass]
   public class AdditiveMoveMaker : SingleSuccessorOperator, IAdditiveRealVectorMoveOperator, IMoveMaker {
+  public class AdditiveMoveMaker : SingleSuccessorOperator, IAdditiveRealVectorMoveOperator, IMoveMaker, ISingleObjectiveOperator {
     public override bool CanChangeName {
       get { return false; }

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves/AdditiveMoveTabuAttribute.cs

r11171	r12031
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves/AdditiveMoveTabuChecker.cs

r11171	r12031
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves/AdditiveMoveTabuMaker.cs

r11171	r12031
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves/StochasticNormalMultiMoveGenerator.cs

r11171	r12031
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves/StochasticPolynomialMultiMoveGenerator.cs

r11171	r12031
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2015 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 12031 for branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves

Legend:

Download in other formats: