Changeset 11961 for trunk/sources/HeuristicLab.Optimization/3.3/BasicProblems

Timestamp:

02/06/15 17:52:14 (10 years ago)

Author:

abeham

Message:

#2174: Integrated programmable problem into trunk

• Fixed build configuration
• Fixed some assembly references that had CopyLocal set to true
• Added a missing license header
• Cleaned some usings
• Fixed the version number in ExternalEvaluation.GP
• Added ProgrammableProblem and new ExternalEvaluationProblem as a reference to unit tests
• Fixed plugin dependencies and assembly references
• Changed icon of programmable problem to script icon
• Fixed name clash in VRP that also had defined a "PermutationEncoding" class
• (Hopefully) fixed all output paths

Location:

trunk/sources/HeuristicLab.Optimization

Files:

• . (modified) (1 prop)
• 3.3/BasicProblems (copied) (copied from branches/ProgrammableProblem/HeuristicLab.Optimization/3.3/BasicProblems)
• 3.3/BasicProblems/Encoding.cs (modified) (1 diff)
• 3.3/BasicProblems/Interfaces/IEncoding.cs (modified) (1 diff)
• 3.3/BasicProblems/Interfaces/IMultiObjectiveProblemDefinition.cs (modified) (1 diff)
• 3.3/BasicProblems/Interfaces/IProblemDefinition.cs (modified) (1 diff)
• 3.3/BasicProblems/Interfaces/ISingleObjectiveMoveOperator.cs (modified) (1 diff)
• 3.3/BasicProblems/Interfaces/ISingleObjectiveProblemDefinition.cs (modified) (1 diff)
• 3.3/BasicProblems/Interfaces/internal/IMultiObjectiveEvaluationOperator.cs (modified) (1 diff)
• 3.3/BasicProblems/Interfaces/internal/ISingleObjectiveAnalysisOperator.cs (modified) (1 diff)
• 3.3/BasicProblems/Interfaces/internal/ISingleObjectiveEvaluationOperator.cs (modified) (1 diff)
• 3.3/BasicProblems/Operators/MultiEncodingManipulator.cs (modified) (1 diff)
• 3.3/BasicProblems/Operators/MultiEncodingOperator.cs (modified) (1 diff)
• 3.3/BasicProblems/Operators/MultiObjectiveAnalyzer.cs (modified) (2 diffs)
• 3.3/BasicProblems/Operators/MultiObjectiveEvaluator.cs (modified) (1 diff)
• 3.3/BasicProblems/Operators/SingleObjectiveAnalyzer.cs (modified) (2 diffs)
• 3.3/BasicProblems/Operators/SingleObjectiveEvaluator.cs (modified) (1 diff)
• 3.3/BasicProblems/Operators/SingleObjectiveImprover.cs (modified) (1 diff)
• 3.3/BasicProblems/Operators/SingleObjectiveMoveEvaluator.cs (modified) (1 diff)
• 3.3/BasicProblems/Operators/SingleObjectiveMoveGenerator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Optimization/3.3/BasicProblems/Encoding.cs

@@ -25 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;

trunk/sources/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/IEncoding.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using HeuristicLab.Core;
-using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Optimization {

trunk/sources/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/IMultiObjectiveProblemDefinition.cs

@@ -21 +21 @@
 
 using HeuristicLab.Core;
-using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Optimization {

trunk/sources/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/IProblemDefinition.cs

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Core;
-
 namespace HeuristicLab.Optimization {
   public interface IProblemDefinition {

trunk/sources/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/ISingleObjectiveMoveOperator.cs

@@ -19 +19 @@
  */
 #endregion
-using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Optimization {

trunk/sources/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/ISingleObjectiveProblemDefinition.cs

@@ -22 +22 @@
 using System.Collections.Generic;
 using HeuristicLab.Core;
-using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Optimization {

trunk/sources/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/internal/IMultiObjectiveEvaluationOperator.cs

@@ -22 +22 @@
 using System;
 using HeuristicLab.Core;
-using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Optimization {

trunk/sources/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/internal/ISingleObjectiveAnalysisOperator.cs

@@ -22 +22 @@
 using System;
 using HeuristicLab.Core;
-using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Optimization {

trunk/sources/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/internal/ISingleObjectiveEvaluationOperator.cs

@@ -22 +22 @@
 using System;
 using HeuristicLab.Core;
-using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Optimization {

trunk/sources/HeuristicLab.Optimization/3.3/BasicProblems/Operators/MultiEncodingManipulator.cs

@@ -22 +22 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 

trunk/sources/HeuristicLab.Optimization/3.3/BasicProblems/Operators/MultiEncodingOperator.cs

@@ -19 +19 @@
  */
 #endregion
+
 using System;
 using System.Collections.Generic;

trunk/sources/HeuristicLab.Optimization/3.3/BasicProblems/Operators/MultiObjectiveAnalyzer.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -6 +27 @@
 using HeuristicLab.Data;
 using HeuristicLab.Operators;
-using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;

trunk/sources/HeuristicLab.Optimization/3.3/BasicProblems/Operators/MultiObjectiveEvaluator.cs

@@ -25 +25 @@
 using HeuristicLab.Data;
 using HeuristicLab.Operators;
-using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;

trunk/sources/HeuristicLab.Optimization/3.3/BasicProblems/Operators/SingleObjectiveAnalyzer.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -6 +27 @@
 using HeuristicLab.Data;
 using HeuristicLab.Operators;
-using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;

trunk/sources/HeuristicLab.Optimization/3.3/BasicProblems/Operators/SingleObjectiveEvaluator.cs

@@ -25 +25 @@
 using HeuristicLab.Data;
 using HeuristicLab.Operators;
-using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;

trunk/sources/HeuristicLab.Optimization/3.3/BasicProblems/Operators/SingleObjectiveImprover.cs

@@ -27 +27 @@
 using HeuristicLab.Data;
 using HeuristicLab.Operators;
-using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;

trunk/sources/HeuristicLab.Optimization/3.3/BasicProblems/Operators/SingleObjectiveMoveEvaluator.cs

@@ -25 +25 @@
 using HeuristicLab.Data;
 using HeuristicLab.Operators;
-using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;

trunk/sources/HeuristicLab.Optimization/3.3/BasicProblems/Operators/SingleObjectiveMoveGenerator.cs

@@ -28 +28 @@
 using HeuristicLab.Data;
 using HeuristicLab.Operators;
-using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;