Changeset 7558

Timestamp:

03/06/12 01:43:06 (13 years ago)

Author:

abeham

Message:

#1782: trunk integration of problem instance development

• Adapted TSP and QAP to use the new feature
• Moved the TSPLIB importer dialog from the TSP plugin to the TSPLIB instances plugin (created a view for that provider)
• Created it as a default view for IHeuristicOptimizationProblem in order not to interfere with other problems do not yet work with this

Location:

trunk/sources

Files:

• HeuristicLab 3.3.sln (modified) (view diffs)
• HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj (modified) (view diffs)
• HeuristicLab.Optimization.Views/3.3/HeuristicOptimizationProblemView.Designer.cs (added)
• HeuristicLab.Optimization.Views/3.3/HeuristicOptimizationProblemView.cs (added)
• HeuristicLab.Optimization.Views/3.3/Plugin.cs.frame (modified) (view diffs)
• HeuristicLab.Optimization.Views/3.3/ProblemInstanceProviderView.Designer.cs (copied) (copied from branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/ProblemInstanceProviderView.Designer.cs) (view diffs)
• HeuristicLab.Optimization.Views/3.3/ProblemInstanceProviderView.cs (copied) (copied from branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/ProblemInstanceProviderView.cs) (view diffs)
• HeuristicLab.Problems.Instances (copied) (copied from branches/GeneralizedQAP/HeuristicLab.Problems.Instances) (view diffs)
• HeuristicLab.Problems.Instances.CordeauGQAP (copied) (copied from branches/GeneralizedQAP/HeuristicLab.Problems.Instances.CordeauGQAP) (view diffs)
• HeuristicLab.Problems.Instances.CordeauGQAP/3.3/HeuristicLab.Problems.Instances.CordeauGQAP-3.3.csproj (modified) (view diffs)
• HeuristicLab.Problems.Instances.CordeauGQAP/3.3/Plugin.cs.frame (modified) (view diffs)
• HeuristicLab.Problems.Instances.ElloumiCTAP (copied) (copied from branches/GeneralizedQAP/HeuristicLab.Problems.Instances.ElloumiCTAP) (view diffs)
• HeuristicLab.Problems.Instances.ElloumiCTAP/3.3/HeuristicLab.Problems.Instances.ElloumiCTAP-3.3.csproj (modified) (view diffs)
• HeuristicLab.Problems.Instances.ElloumiCTAP/3.3/Plugin.cs.frame (modified) (view diffs)
• HeuristicLab.Problems.Instances.QAPLIB (copied) (copied from branches/GeneralizedQAP/HeuristicLab.Problems.Instances.QAPLIB) (view diffs)
• HeuristicLab.Problems.Instances.QAPLIB/3.3 (modified) (view diffs)
• HeuristicLab.Problems.Instances.QAPLIB/3.3/HeuristicLab.Problems.Instances.QAPLIB-3.3.csproj (modified) (view diffs)
• HeuristicLab.Problems.Instances.QAPLIB/3.3/Plugin.cs.frame (modified) (view diffs)
• HeuristicLab.Problems.Instances.QAPLIB/3.3/QAPLIBInstanceProvider.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.QAPLIB/3.3/QAPLIBParser.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.TSPLIB (copied) (copied from branches/GeneralizedQAP/HeuristicLab.Problems.Instances.TSPLIB) (view diffs)
• HeuristicLab.Problems.Instances.TSPLIB.Views (added)
• HeuristicLab.Problems.Instances.TSPLIB.Views/3.3 (added)
• HeuristicLab.Problems.Instances.TSPLIB.Views/3.3/HeuristicLab.Problems.Instances.TSPLIB.Views-3.3.csproj (added)
• HeuristicLab.Problems.Instances.TSPLIB.Views/3.3/HeuristicLab.snk (added)
• HeuristicLab.Problems.Instances.TSPLIB.Views/3.3/Plugin.cs.frame (added)
• HeuristicLab.Problems.Instances.TSPLIB.Views/3.3/Properties (added)
• HeuristicLab.Problems.Instances.TSPLIB.Views/3.3/Properties/AssemblyInfo.cs.frame (added)
• HeuristicLab.Problems.Instances.TSPLIB.Views/3.3/TSPLIBImportDialog.Designer.cs (added)
• HeuristicLab.Problems.Instances.TSPLIB.Views/3.3/TSPLIBImportDialog.cs (added)
• HeuristicLab.Problems.Instances.TSPLIB.Views/3.3/TSPLIBTSPInstanceProviderView.Designer.cs (added)
• HeuristicLab.Problems.Instances.TSPLIB.Views/3.3/TSPLIBTSPInstanceProviderView.cs (added)
• HeuristicLab.Problems.Instances.TSPLIB/3.3/HeuristicLab.Problems.Instances.TSPLIB-3.3.csproj (modified) (view diffs)
• HeuristicLab.Problems.Instances.TSPLIB/3.3/Plugin.cs.frame (modified) (view diffs)
• HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBTSPInstanceProvider.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances/3.3/ClassDiagram1.cd (deleted)
• HeuristicLab.Problems.Instances/3.3/HeuristicLab.Problems.Instances-3.3.csproj (copied) (copied from branches/GeneralizedQAP/HeuristicLab.Problems.Instances/3.3/HeuristicLab.Problems.Instances-3.3.csproj) (view diffs)
• HeuristicLab.Problems.Instances/3.3/IExportable.cs (copied) (copied from branches/GeneralizedQAP/HeuristicLab.Problems.Instances/3.3/IExportable.cs) (view diffs)
• HeuristicLab.Problems.QuadraticAssignment.Algorithms/3.3/HeuristicLab.Problems.QuadraticAssignment.Algorithms-3.3.csproj (modified) (view diffs)
• HeuristicLab.Problems.QuadraticAssignment.Views/3.3/HeuristicLab.Problems.QuadraticAssignment.Views-3.3.csproj (modified) (view diffs)
• HeuristicLab.Problems.QuadraticAssignment.Views/3.3/Plugin.cs.frame (modified) (view diffs)
• HeuristicLab.Problems.QuadraticAssignment.Views/3.3/QuadraticAssignmentProblemView.Designer.cs (modified) (view diffs)
• HeuristicLab.Problems.QuadraticAssignment.Views/3.3/QuadraticAssignmentProblemView.cs (modified) (view diffs)
• HeuristicLab.Problems.QuadraticAssignment/3.3/Data (deleted)
• HeuristicLab.Problems.QuadraticAssignment/3.3/HeuristicLab.Problems.QuadraticAssignment-3.3.csproj (modified) (view diffs)
• HeuristicLab.Problems.QuadraticAssignment/3.3/Parsers (deleted)
• HeuristicLab.Problems.QuadraticAssignment/3.3/Plugin.cs.frame (modified) (view diffs)
• HeuristicLab.Problems.QuadraticAssignment/3.3/QuadraticAssignmentProblem.cs (modified) (view diffs)
• HeuristicLab.Problems.TravelingSalesman.Views/3.3/HeuristicLab.Problems.TravelingSalesman.Views-3.3.csproj (modified) (view diffs)
• HeuristicLab.Problems.TravelingSalesman.Views/3.3/Plugin.cs.frame (modified) (view diffs)
• HeuristicLab.Problems.TravelingSalesman.Views/3.3/TSPLIBImportDialog.Designer.cs (deleted)
• HeuristicLab.Problems.TravelingSalesman.Views/3.3/TSPLIBImportDialog.cs (deleted)
• HeuristicLab.Problems.TravelingSalesman.Views/3.3/TravelingSalesmanProblemView.Designer.cs (modified) (view diffs)
• HeuristicLab.Problems.TravelingSalesman.Views/3.3/TravelingSalesmanProblemView.cs (modified) (view diffs)
• HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPCoordinatesPathEvaluator.cs (modified) (view diffs)
• HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPDistanceMatrixEvaluator.cs (added)
• HeuristicLab.Problems.TravelingSalesman/3.3/HeuristicLab.Problems.TravelingSalesman-3.3.csproj (modified) (view diffs)
• HeuristicLab.Problems.TravelingSalesman/3.3/Interfaces/ITSPDistanceMatrixEvaluator.cs (added)
• HeuristicLab.Problems.TravelingSalesman/3.3/Plugin.cs.frame (modified) (view diffs)
• HeuristicLab.Problems.TravelingSalesman/3.3/TSPLIB Sample Problems (deleted)
• HeuristicLab.Problems.TravelingSalesman/3.3/TSPLIBParser.cs (deleted)
• HeuristicLab.Problems.TravelingSalesman/3.3/TSPLIBTourParser.cs (deleted)
• HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs (modified) (view diffs)
• HeuristicLab.Tests/Builder.testsettings (modified) (view diffs)
• HeuristicLab.Tests/HeuristicLab-3.3/Resources/ch130.opt.tour (deleted)
• HeuristicLab.Tests/HeuristicLab-3.3/Resources/ch130.tsp (deleted)
• HeuristicLab.Tests/HeuristicLab-3.3/SamplesTest.cs (modified) (view diffs)
• HeuristicLab.Tests/HeuristicLab.Problems.QuadraticAssignment-3.3/QAPLIB (deleted)
• HeuristicLab.Tests/HeuristicLab.Problems.QuadraticAssignment-3.3/QAPLIBInstancesTest.cs (modified) (view diffs)
• HeuristicLab.Tests/HeuristicLab.Tests.csproj (modified) (view diffs)

trunk/sources/HeuristicLab.Problems.Instances.QAPLIB/3.3

@@ -2 +2 @@
 obj
 Plugin.cs
+bin

@@ -2 +2 @@
 obj
 Plugin.cs
+bin

@@ -2 +2 @@
 obj
 Plugin.cs
+bin