Context Navigation

HeuristicLab.Optimization

Timestamp:

06/29/15 10:48:35 (9 years ago)

Author:

pfleck

Message:

#2027

Location:

branches/TerminationCriteria/HeuristicLab.Optimization/3.3

Files:

HeuristicLab.Optimization-3.3.csproj (modified) (2 diffs)
Interfaces/ITerminationBasedOperator.cs (copied) (copied from branches/TerminationCriteria/HeuristicLab.Termination/3.3/ITerminationBasedOperator.cs) (1 diff)
Interfaces/ITerminator.cs (copied) (copied from branches/TerminationCriteria/HeuristicLab.Termination/3.3/ITerminator.cs) (1 diff)
Termination (added)
Termination/ComparisonTerminator.cs (copied) (copied from branches/TerminationCriteria/HeuristicLab.Termination/3.3/ComparisonTerminator.cs) (1 diff)
Termination/ExecutionTimeTerminator.cs (copied) (copied from branches/TerminationCriteria/HeuristicLab.Termination/3.3/ExecutionTimeTerminator.cs) (1 diff)
Termination/MultiTerminator.cs (copied) (copied from branches/TerminationCriteria/HeuristicLab.Termination/3.3/MultiTerminator.cs) (1 diff)
Termination/SingleObjectiveQualityTerminator.cs (copied) (copied from branches/TerminationCriteria/HeuristicLab.Termination/3.3/SingleObjectiveQualityTerminator.cs) (1 diff)
Termination/TerminationOperator.cs (copied) (copied from branches/TerminationCriteria/HeuristicLab.Termination/3.3/TerminationOperator.cs) (1 diff)
Termination/Terminator.cs (copied) (copied from branches/TerminationCriteria/HeuristicLab.Termination/3.3/Terminator.cs) (1 diff)
Termination/ThresholdTerminator.cs (copied) (copied from branches/TerminationCriteria/HeuristicLab.Termination/3.3/ThresholdTerminator.cs) (1 diff)

-                      r12528
+                      r12529
     <Compile Include="Interfaces\ISimilarityBasedOperator.cs" />
     <Compile Include="Interfaces\ISolutionSimilarityCalculator.cs" />
+    <Compile Include="Interfaces\ITerminationBasedOperator.cs" />
+    <Compile Include="Interfaces\ITerminator.cs" />
     <Compile Include="MetaOptimizers\BatchRun.cs" />
     <Compile Include="MetaOptimizers\Experiment.cs" />
 …
     <Compile Include="RunCollectionModification\RunCollectionValueRemover.cs" />
     <Compile Include="Interfaces\IRunCollectionModifier.cs" />
+    <Compile Include="Termination\ComparisonTerminator.cs" />
+    <Compile Include="Termination\ExecutionTimeTerminator.cs" />
+    <Compile Include="Termination\MultiTerminator.cs" />
+    <Compile Include="Termination\SingleObjectiveQualityTerminator.cs" />
+    <Compile Include="Termination\TerminationOperator.cs" />
+    <Compile Include="Termination\Terminator.cs" />
+    <Compile Include="Termination\ThresholdTerminator.cs" />
     <None Include="Plugin.cs.frame" />
     <Compile Include="Algorithms\Algorithm.cs" />

r12527	r12529
23	23	using HeuristicLab.Data;
24	24
25		namespace HeuristicLab.~~Termin~~ation {
	25	namespace HeuristicLab.Optimization {
26	26	public interface ITerminationBasedOperator : IOperator {
27	27	ILookupParameter<BoolValue> TerminateParameter { get; }

-                      r12527
+                      r12529
 #endregion
+using HeuristicLab.Core;
+namespace HeuristicLab.Termination {
+namespace HeuristicLab.Optimization {
   /// <summary>
   /// An interface which represents an operator for checking a termination criterion.

r12527	r12529
28	28	using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
29	29
30		namespace HeuristicLab.~~Termin~~ation {
	30	namespace HeuristicLab.Optimization {
31	31	[Item("ComparisonTerminator", "An termination criterion which compares two values.")]
32	32	[StorableClass]

r12527	r12529
26	26	using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
27	27
28		namespace HeuristicLab.~~Termin~~ation {
	28	namespace HeuristicLab.Optimization {
29	29	[Item("ExecutionTimeTerminator", "A termination criterion based on execution time of an algorithm.")]
30	30	[StorableClass]

r12527	r12529
31	31	using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
32	32
33		namespace HeuristicLab.~~Termin~~ation {
	33	namespace HeuristicLab.Optimization {
34	34	[Item("MultiTerminator", "A multi operator, containing termination criteria.")]
35	35	[StorableClass]

-                      r12527
+                      r12529
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 namespace HeuristicLab.Termination {
+namespace HeuristicLab.Optimization {
   [Item("SingleObjectiveQualityTerminator", "A termination criterion which uses a quality parameter (eg. current best quality) for termination.")]
   [StorableClass]

r12527	r12529
27	27	using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
28	28
29		namespace HeuristicLab.~~Termin~~ation {
	29	namespace HeuristicLab.Optimization {
30	30	[Item("TerminationOperator", "An operator which either calls the terminate- or the continue branch.")]
31	31	[StorableClass]

r12527	r12529
29	29	using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
30	30
31		namespace HeuristicLab.~~Termin~~ation {
	31	namespace HeuristicLab.Optimization {
32	32	[Item("Terminator", "A base class for all termination criteria.")]
33	33	[StorableClass]

r12527	r12529
27	27	using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
28	28
29		namespace HeuristicLab.~~Termin~~ation {
	29	namespace HeuristicLab.Optimization {
30	30	[Item("ThresholdTerminator", "Base class for all termination criteria which specifies some threshold.")]
31	31	[StorableClass]

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