Context Navigation

← Previous Change
Next Change →

Interfaces

Timestamp:

03/28/19 16:54:20 (6 years ago)

Author:

abeham

Message:

#2521: merged changes from r15684 to trunk HEAD (r16716) and resolved all merge conflicts

it doesn't build

Location:

branches/2521_ProblemRefactoring

Files:

: 18 edited

. (modified) (1 prop)
HeuristicLab.Encodings.RealVectorEncoding (modified) (1 prop)
HeuristicLab.Encodings.RealVectorEncoding/3.3/Interfaces/IRealVectorAdditiveMoveOperator.cs (modified) (2 diffs)
HeuristicLab.Encodings.RealVectorEncoding/3.3/Interfaces/IRealVectorBoundsChecker.cs (modified) (2 diffs)
HeuristicLab.Encodings.RealVectorEncoding/3.3/Interfaces/IRealVectorCreator.cs (modified) (2 diffs)
HeuristicLab.Encodings.RealVectorEncoding/3.3/Interfaces/IRealVectorCrossover.cs (modified) (2 diffs)
HeuristicLab.Encodings.RealVectorEncoding/3.3/Interfaces/IRealVectorManipulator.cs (modified) (2 diffs)
HeuristicLab.Encodings.RealVectorEncoding/3.3/Interfaces/IRealVectorMoveGenerator.cs (modified) (2 diffs)
HeuristicLab.Encodings.RealVectorEncoding/3.3/Interfaces/IRealVectorMoveOperator.cs (modified) (2 diffs)
HeuristicLab.Encodings.RealVectorEncoding/3.3/Interfaces/IRealVectorMultiNeighborhoodShakingOperator.cs (modified) (2 diffs)
HeuristicLab.Encodings.RealVectorEncoding/3.3/Interfaces/IRealVectorOperator.cs (modified) (2 diffs)
HeuristicLab.Encodings.RealVectorEncoding/3.3/Interfaces/IRealVectorParticleCreator.cs (modified) (2 diffs)
HeuristicLab.Encodings.RealVectorEncoding/3.3/Interfaces/IRealVectorParticleUpdater.cs (modified) (2 diffs)
HeuristicLab.Encodings.RealVectorEncoding/3.3/Interfaces/IRealVectorStdDevStrategyParameterCreator.cs (modified) (2 diffs)
HeuristicLab.Encodings.RealVectorEncoding/3.3/Interfaces/IRealVectorStdDevStrategyParameterCrossover.cs (modified) (2 diffs)
HeuristicLab.Encodings.RealVectorEncoding/3.3/Interfaces/IRealVectorStdDevStrategyParameterManipulator.cs (modified) (2 diffs)
HeuristicLab.Encodings.RealVectorEncoding/3.3/Interfaces/IRealVectorStdDevStrategyParameterOperator.cs (modified) (2 diffs)
HeuristicLab.Encodings.RealVectorEncoding/3.3/Interfaces/IRealVectorSwarmUpdater.cs (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed

branches/2521_ProblemRefactoring

Property svn:mergeinfo changed

/branches/2520_PersistenceReintegration (added)	merged: 16451-16454,16462,16465-16468,16470-16472,16474,16476-16477,16479-16487,16529-16530,16539,16551-16555,16558-16559,16562-16564
/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/2892_LR-prediction-intervals (added)	merged: 15743-15744,16388
/branches/2915-AbsoluteSymbol (added)	merged: 15943-15944,16236-16240,16304,16306,16332,16344-16352,16355
/branches/2916_IndexedDataTableSerialization (added)	merged: 15918
/branches/2937_SymReg_AnalyticalQuotient (added)	merged: 16083
/branches/2947_ConfigurableIndexedDataTable (added)	merged: 16148-16150,16156,16520,16524
/branches/2965_CancelablePersistence (added)	merged: 16321,16325,16433,16439
/branches/2972_PDPRowSelect (added)	merged: 16444-16445,16516-16518
/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
/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,16309,16333-16334,16341-16343,16356-16362,16365-16366,16378-16379,16381-16382,16389,16392,16394,16407,16415,16422,16427,16430-16431,16440-16441,16443,16446,16448-16449,16478,16491,16494,16496,16499,16501-16506,16511-16513,16519,16526-16528,16542-16543,16565,16568-16569,16571-16572,16578-16579,16584-16585,16594-16595,16619,16622-16626,16629,16631,16646,16648,16651,16656,16658-16659,16661,16668,16670,16672,16681,16700-16704,16706-16707,16716
/trunk/sources	merged: 15682-15683

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.RealVectorEncoding

Property svn:mergeinfo changed

/branches/2520_PersistenceReintegration/HeuristicLab.Encodings.RealVectorEncoding (added)	merged: 16452-16454,16462,16474,16529,16539,16558-16559
/branches/2839_HiveProjectManagement/HeuristicLab.Encodings.RealVectorEncoding (added)	merged: 16057
/branches/2892_LR-prediction-intervals/HeuristicLab.Encodings.RealVectorEncoding (added)	merged: 16388
/branches/2915-AbsoluteSymbol/HeuristicLab.Encodings.RealVectorEncoding (added)	merged: 16240
/branches/2947_ConfigurableIndexedDataTable/HeuristicLab.Encodings.RealVectorEncoding (added)	merged: 16520
/branches/2965_CancelablePersistence/HeuristicLab.Encodings.RealVectorEncoding (added)	merged: 16433
/trunk/HeuristicLab.Encodings.RealVectorEncoding (added)	merged: 16117,16356,16389,16430,16440,16527,16565,16568,16585,16625,16658

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.RealVectorEncoding/3.3/Interfaces/IRealVectorAdditiveMoveOperator.cs

-                      r16692
+                      r16723
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 using HeuristicLab.Core;
+using HEAL.Attic;
 namespace HeuristicLab.Encodings.RealVectorEncoding {
+  [StorableType("e1788907-b2bd-410c-b660-501fbfdf26d2")]
   public interface IRealVectorAdditiveMoveOperator : IRealVectorMoveOperator {
     ILookupParameter<AdditiveMove> AdditiveMoveParameter { get; }

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.RealVectorEncoding/3.3/Interfaces/IRealVectorBoundsChecker.cs

-                      r16692
+                      r16723
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
+using HEAL.Attic;
 namespace HeuristicLab.Encodings.RealVectorEncoding {
+  [StorableType("05af3346-d753-46aa-ab1c-fa5008611d06")]
   public interface IRealVectorBoundsChecker : IOperator {
     LookupParameter<RealVector> RealVectorParameter { get; }

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.RealVectorEncoding/3.3/Interfaces/IRealVectorCreator.cs

-                      r16692
+                      r16723
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 using HeuristicLab.Data;
 using HeuristicLab.Optimization;
+using HEAL.Attic;
 namespace HeuristicLab.Encodings.RealVectorEncoding {
+  [StorableType("6f7d06b2-8e65-473c-b172-e0a011076a79")]
   /// <summary>
   /// An interface which represents an operator for creating vectors of real-valued data.

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.RealVectorEncoding/3.3/Interfaces/IRealVectorCrossover.cs

-                      r16692
+                      r16723
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
+using HEAL.Attic;
 namespace HeuristicLab.Encodings.RealVectorEncoding {
+  [StorableType("b589675c-e174-4f35-8a37-0967ec119cda")]
   /// <summary>
   /// An interface which represents an operator for crossing vectors of real-valued data.

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.RealVectorEncoding/3.3/Interfaces/IRealVectorManipulator.cs

-                      r16692
+                      r16723
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 using HeuristicLab.Optimization;
+using HEAL.Attic;
 namespace HeuristicLab.Encodings.RealVectorEncoding {
+  [StorableType("4d5f6fe2-924e-4052-b1c3-32d12b232353")]
   /// <summary>
   /// An interface which represents an operator for manipulating vectors of real-valued data.

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.RealVectorEncoding/3.3/Interfaces/IRealVectorMoveGenerator.cs

-                      r16692
+                      r16723
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 using HeuristicLab.Optimization;
+using HEAL.Attic;
 namespace HeuristicLab.Encodings.RealVectorEncoding {
+  [StorableType("a8fa1f76-74ce-4b42-bbc6-1b844e9338d9")]
   public interface IRealVectorMoveGenerator : IRealVectorMoveOperator, IRealVectorBoundedOperator, IMoveGenerator {
+  }

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.RealVectorEncoding/3.3/Interfaces/IRealVectorMoveOperator.cs

-                      r16692
+                      r16723
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 using HeuristicLab.Optimization;
+using HEAL.Attic;
 namespace HeuristicLab.Encodings.RealVectorEncoding {
+  [StorableType("ebd6c0f9-6be5-4661-ba4c-0522d33aa5c4")]
   public interface IRealVectorMoveOperator : IRealVectorSolutionOperator, IMoveOperator {
+  }

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.RealVectorEncoding/3.3/Interfaces/IRealVectorMultiNeighborhoodShakingOperator.cs

-                      r16692
+                      r16723
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 #endregion
+using HEAL.Attic;
 namespace HeuristicLab.Encodings.RealVectorEncoding {
+  [StorableType("0dee2cb0-6279-4337-bbae-a0ba95d5bbb8")]
   public interface IRealVectorMultiNeighborhoodShakingOperator : IRealVectorSolutionOperator, IRealVectorBoundedOperator {
+  }

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.RealVectorEncoding/3.3/Interfaces/IRealVectorOperator.cs

-                      r16692
+                      r16723
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 using HeuristicLab.Core;
+using HEAL.Attic;
 namespace HeuristicLab.Encodings.RealVectorEncoding {
+  [StorableType("af0ebc2c-280c-4dc4-8f53-e067994e7491")]
   /// <summary>
   /// An interface which represents an operator dealing with vectors of real-valued data.

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.RealVectorEncoding/3.3/Interfaces/IRealVectorParticleCreator.cs

-                      r16692
+                      r16723
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 using HeuristicLab.Data;
 using HeuristicLab.Optimization;
+using HEAL.Attic;
 namespace HeuristicLab.Encodings.RealVectorEncoding {
+  [StorableType("4e4287a4-1bd9-4056-b203-ad97e4c418fb")]
   public interface IRealVectorParticleCreator : IParticleCreator, IRealVectorSolutionOperator, IRealVectorBoundedOperator {
     ILookupParameter<RealVector> PersonalBestParameter { get; }

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.RealVectorEncoding/3.3/Interfaces/IRealVectorParticleUpdater.cs

-                      r16692
+                      r16723
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 using HeuristicLab.Data;
 using HeuristicLab.Optimization;
+using HEAL.Attic;
 namespace HeuristicLab.Encodings.RealVectorEncoding {
+  [StorableType("34b1f071-c5a0-471c-9ee2-cdf0d27c82b3")]
   public interface IRealVectorParticleUpdater : IParticleUpdater, IRealVectorSolutionOperator, IRealVectorBoundedOperator {
     ILookupParameter<RealVector> VelocityParameter { get; }

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.RealVectorEncoding/3.3/Interfaces/IRealVectorStdDevStrategyParameterCreator.cs

-                      r16692
+                      r16723
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 using HeuristicLab.Data;
 using HeuristicLab.Optimization;
+using HEAL.Attic;
 namespace HeuristicLab.Encodings.RealVectorEncoding {
+  [StorableType("36856de6-6cb5-4b8b-8a2b-2437fd5f5c28")]
   public interface IRealVectorStdDevStrategyParameterCreator : IRealVectorStdDevStrategyParameterOperator, IStrategyParameterCreator, IRealVectorBoundedOperator {
     ILookupParameter<RealVector> StrategyParameterParameter { get; }

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.RealVectorEncoding/3.3/Interfaces/IRealVectorStdDevStrategyParameterCrossover.cs

-                      r16692
+                      r16723
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
+using HEAL.Attic;
 namespace HeuristicLab.Encodings.RealVectorEncoding {
+  [StorableType("41e66ad7-37d5-4508-b128-4e4e7c32e362")]
   public interface IRealVectorStdDevStrategyParameterCrossover : IRealVectorStdDevStrategyParameterOperator, IStrategyParameterCrossover {
     ILookupParameter<RealVector> StrategyParameterParameter { get; }

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.RealVectorEncoding/3.3/Interfaces/IRealVectorStdDevStrategyParameterManipulator.cs

-                      r16692
+                      r16723
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
+using HEAL.Attic;
 namespace HeuristicLab.Encodings.RealVectorEncoding {
+  [StorableType("a25675fb-a613-4b70-9572-d9d1793b5da3")]
   public interface IRealVectorStdDevStrategyParameterManipulator : IRealVectorStdDevStrategyParameterOperator, IStrategyParameterManipulator, IRealVectorBoundedOperator {
     ILookupParameter<RealVector> StrategyParameterParameter { get; }

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.RealVectorEncoding/3.3/Interfaces/IRealVectorStdDevStrategyParameterOperator.cs

-                      r16692
+                      r16723
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 #endregion
 using HeuristicLab.Core;
+using HEAL.Attic;
 namespace HeuristicLab.Encodings.RealVectorEncoding {
+  [StorableType("57da67bb-c9c6-4cc1-a2eb-6c2ee8cb0363")]
   public interface IRealVectorStdDevStrategyParameterOperator : IOperator {
+  }

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.RealVectorEncoding/3.3/Interfaces/IRealVectorSwarmUpdater.cs

-                      r16692
+                      r16723
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
+using HEAL.Attic;
 namespace HeuristicLab.Encodings.RealVectorEncoding {
+  [StorableType("d8a15c9c-e2e8-4494-bc0e-97ccad304757")]
   public interface IRealVectorSwarmUpdater : ISwarmUpdater, IRealVectorSolutionsOperator {
     IScopeTreeLookupParameter<RealVector> NeighborBestParameter { get; }

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

Context Navigation

Changeset 16723 for branches/2521_ProblemRefactoring/HeuristicLab.Encodings.RealVectorEncoding/3.3/Interfaces

Legend:

Download in other formats: