Changeset 16910

Timestamp:

05/07/19 15:30:17 (6 years ago)

Author:

abeham

Message:

#2931: merged to trunk

• Fixed references in plugins
• Fixed output path
• Removed app.config from views plugin
• Reverted changes to PathValue and FileValue and their respective views

Location:

trunk

Files:

• . (modified) (view diffs)
• HeuristicLab 3.3.sln (modified) (view diffs)
• HeuristicLab.Core (modified) (view diffs)
• HeuristicLab.Core/3.3/Attributes/CreatableAttribute.cs (modified) (view diffs)
• HeuristicLab.Data (modified) (view diffs)
• HeuristicLab.Data.Views (modified) (view diffs)
• HeuristicLab.Data.Views/3.3 (modified) (view diffs)
• HeuristicLab.Data.Views/3.3/HeuristicLab.Data.Views-3.3.csproj (modified) (view diffs)
• HeuristicLab.Data.Views/3.3/TextValueView.Designer.cs (copied) (copied from branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data.Views/3.3/TextValueView.Designer.cs) (view diffs)
• HeuristicLab.Data.Views/3.3/TextValueView.cs (copied) (copied from branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data.Views/3.3/TextValueView.cs) (view diffs)
• HeuristicLab.Data/3.3 (modified) (view diffs)
• HeuristicLab.Data/3.3/HeuristicLab.Data-3.3.csproj (modified) (view diffs)
• HeuristicLab.Data/3.3/Interfaces/ITextValue.cs (copied) (copied from branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data/3.3/Interfaces/ITextValue.cs) (view diffs)
• HeuristicLab.Data/3.3/TextValue.cs (copied) (copied from branches/2931_OR-Tools_LP_MIP/HeuristicLab.Data/3.3/TextValue.cs) (view diffs)
• HeuristicLab.ExactOptimization (copied) (copied from branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExactOptimization) (view diffs)
• HeuristicLab.ExactOptimization.Views (copied) (copied from branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExactOptimization.Views) (view diffs)
• HeuristicLab.ExactOptimization.Views/3.3 (modified) (view diffs)
• HeuristicLab.ExactOptimization.Views/3.3/HeuristicLab.ExactOptimization.Views-3.3.csproj (modified) (view diffs)
• HeuristicLab.ExactOptimization.Views/3.3/Properties (modified) (view diffs)
• HeuristicLab.ExactOptimization.Views/3.3/app.config (deleted)
• HeuristicLab.ExactOptimization/3.3 (modified) (view diffs)
• HeuristicLab.ExactOptimization/3.3/HeuristicLab.ExactOptimization-3.3.csproj (modified) (view diffs)
• HeuristicLab.ExactOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/IncrementalLinearSolver.cs (modified) (view diffs)
• HeuristicLab.ExactOptimization/3.3/LinearProgramming/Algorithms/Solvers/Base/LinearSolver.cs (modified) (view diffs)
• HeuristicLab.ExactOptimization/3.3/LinearProgramming/Algorithms/Solvers/GlopSolver.cs (modified) (view diffs)
• HeuristicLab.ExactOptimization/3.3/LinearProgramming/Problems/FileBasedLinearProblemDefinition.cs (modified) (view diffs)
• HeuristicLab.ExactOptimization/3.3/LinearProgramming/Problems/LinearProblem.cs (modified) (view diffs)
• HeuristicLab.ExactOptimization/3.3/Properties (modified) (view diffs)
• HeuristicLab.ExtLibs (modified) (view diffs)
• HeuristicLab.ExtLibs.sln (modified) (view diffs)
• HeuristicLab.ExtLibs/HeuristicLab.OrTools (copied) (copied from branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools) (view diffs)
• HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.8.0-pre (deleted)
• HeuristicLab.ExtLibs/HeuristicLab.OrTools/7.0.0 (copied) (copied from branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/7.0.0) (view diffs)
• HeuristicLab.ExtLibs/HeuristicLab.OrTools/7.0.0/HeuristicLab.OrTools-7.0.0 (modified) (view diffs)
• HeuristicLab.ExtLibs/HeuristicLab.OrTools/7.0.0/HeuristicLab.OrTools-7.0.0/Google.OrTools.dll (modified) (view diffs)
• HeuristicLab.ExtLibs/HeuristicLab.OrTools/7.0.0/HeuristicLab.OrTools-7.0.0/Google.OrTools.pdb (modified) (view diffs)
• HeuristicLab.ExtLibs/HeuristicLab.OrTools/7.0.0/HeuristicLab.OrTools-7.0.0/Google.OrTools.runtime.win-x64.dll (modified) (view diffs)
• HeuristicLab.ExtLibs/HeuristicLab.OrTools/7.0.0/HeuristicLab.OrTools-7.0.0/HeuristicLab.OrTools-7.0.0.csproj (modified) (view diffs)
• HeuristicLab.ExtLibs/HeuristicLab.OrTools/7.0.0/HeuristicLab.OrTools-7.0.0/Plugin.cs.frame (modified) (view diffs)
• HeuristicLab.ExtLibs/HeuristicLab.OrTools/7.0.0/HeuristicLab.OrTools-7.0.0/Properties (modified) (view diffs)
• HeuristicLab.Optimization (modified) (view diffs)
• HeuristicLab.Optimization.Views (modified) (view diffs)
• HeuristicLab.Optimization.Views/3.3/BasicAlgorithmView.cs (modified) (view diffs)
• HeuristicLab.Optimization/3.3/Algorithms/BasicAlgorithm.cs (modified) (view diffs)

trunk/HeuristicLab.ExactOptimization.Views/3.3

@@ -12 +12 @@
 *.nuget.props
 *.nuget.targets
+Plugin.cs

@@ -12 +12 @@
 *.nuget.props
 *.nuget.targets
+Plugin.cs

trunk/HeuristicLab.ExactOptimization/3.3

@@ -12 +12 @@
 *.nuget.props
 *.nuget.targets
+Plugin.cs

@@ -12 +12 @@
 *.nuget.props
 *.nuget.targets
+Plugin.cs

@@ -12 +12 @@
 *.nuget.props
 *.nuget.targets
+Plugin.cs

@@ -12 +12 @@
 *.nuget.props
 *.nuget.targets
+Plugin.cs