Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/19/18 14:15:49 (5 years ago)
Author:
ddorfmei
Message:

#2931:

  • moved views to separate plugin HeuristicLab.MathematicalOptimization.Views
  • added button in LinearProgrammingProblemView to select the problem definition type
  • added views for problem definitions
  • added ExportFile parameter to LinearProgrammingAlgorithm
  • extended FileValue and FileValueView by the option to save a file
  • code cleanup
File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/HeuristicLab.MathematicalOptimization-3.3.csproj

    r16373 r16405  
    121121    <Reference Include="System" />
    122122    <Reference Include="System.Core" />
    123     <Reference Include="System.Data" />
    124123    <Reference Include="System.Drawing" />
    125     <Reference Include="System.Windows.Forms" />
    126     <Reference Include="System.Xml" />
     124    <Reference Include="WindowsBase" />
    127125  </ItemGroup>
    128126  <ItemGroup>
    129127    <Compile Include="LinearProgramming\Algorithms\Solvers\BopSolver.cs" />
    130128    <Compile Include="LinearProgramming\Algorithms\Solvers\CoinOrSolver.cs" />
    131     <Compile Include="LinearProgramming\Algorithms\Solvers\Base\ExternalSolver.cs" />
     129    <Compile Include="LinearProgramming\Algorithms\Solvers\Base\ExternalLinearSolver.cs" />
    132130    <Compile Include="LinearProgramming\Algorithms\Solvers\GlopSolver.cs" />
    133131    <Compile Include="LinearProgramming\Algorithms\Solvers\GlpkSolver.cs" />
    134     <Compile Include="LinearProgramming\Algorithms\Solvers\Base\IExternalSolver.cs" />
    135     <Compile Include="LinearProgramming\Algorithms\Solvers\Base\IIncrementalSolver.cs" />
    136     <Compile Include="LinearProgramming\Algorithms\Solvers\Base\ExternalIncrementalSolver.cs" />
    137     <Compile Include="LinearProgramming\Algorithms\Solvers\Base\IncrementalSolver.cs" />
     132    <Compile Include="LinearProgramming\Algorithms\Solvers\Base\IExternalLinearSolver.cs" />
     133    <Compile Include="LinearProgramming\Algorithms\Solvers\Base\IIncrementalLinearSolver.cs" />
     134    <Compile Include="LinearProgramming\Algorithms\Solvers\Base\ExternalIncrementalLinearSolver.cs" />
     135    <Compile Include="LinearProgramming\Algorithms\Solvers\Base\IncrementalLinearSolver.cs" />
    138136    <Compile Include="LinearProgramming\Algorithms\ProblemType.cs" />
    139137    <Compile Include="LinearProgramming\Algorithms\Solvers\ScipSolver.cs" />
    140     <Compile Include="LinearProgramming\Wrapper\BasisStatus.cs" />
     138    <Compile Include="LinearProgramming\Problems\CompiledProblemDefinition.cs" />
     139    <Compile Include="LinearProgramming\Problems\FileBasedLinearProgrammingProblemDefinition.cs" />
     140    <Compile Include="LinearProgramming\Problems\LinearProgrammingProblem.cs" />
     141    <Compile Include="LinearProgramming\Algorithms\BasisStatus.cs" />
    141142    <Compile Include="LinearProgramming\Algorithms\Solvers\CplexSolver.cs" />
    142143    <Compile Include="LinearProgramming\Algorithms\Solvers\GurobiSolver.cs" />
    143     <Compile Include="LinearProgramming\Algorithms\Solvers\Base\ISolver.cs" />
    144     <Compile Include="LinearProgramming\Wrapper\IncrementalityValues.cs" />
    145     <Compile Include="LinearProgramming\Wrapper\IntegerParam.cs" />
    146     <Compile Include="LinearProgramming\Wrapper\LpAlgorithmValues.cs" />
     144    <Compile Include="LinearProgramming\Algorithms\Solvers\Base\ILinearSolver.cs" />
     145    <Compile Include="LinearProgramming\Algorithms\IncrementalityValues.cs" />
     146    <Compile Include="LinearProgramming\Algorithms\IntegerParam.cs" />
     147    <Compile Include="LinearProgramming\Algorithms\LpAlgorithmValues.cs" />
    147148    <Compile Include="LinearProgramming\Problems\ILinearProgrammingProblemDefinition.cs" />
    148149    <Compile Include="LinearProgramming\Algorithms\LinearProgrammingAlgorithm.cs" />
    149     <Compile Include="LinearProgramming\Problems\LinearProgrammingProblem.cs" />
    150     <Compile Include="LinearProgramming\Wrapper\LinearSolverExtensions.cs" />
    151     <Compile Include="LinearProgramming\Wrapper\LinearSolver.cs" />
    152     <Compile Include="LinearProgramming\Problems\LinearProgrammingProblemDefintion.cs" />
    153     <Compile Include="LinearProgramming\Wrapper\OptimizationProblemType.cs" />
    154     <Compile Include="LinearProgramming\Problems\ProblemDefinitionScriptException.cs" />
    155     <Compile Include="LinearProgramming\Algorithms\Solvers\Base\Solver.cs" />
    156     <Compile Include="LinearProgramming\Wrapper\DoubleParam.cs" />
    157     <Compile Include="LinearProgramming\Views\LinearProgrammingProblemDefinitionScriptView.cs">
    158       <SubType>UserControl</SubType>
    159     </Compile>
    160     <Compile Include="LinearProgramming\Views\LinearProgrammingProblemDefinitionScriptView.Designer.cs">
    161       <DependentUpon>LinearProgrammingProblemDefinitionScriptView.cs</DependentUpon>
    162     </Compile>
    163     <Compile Include="LinearProgramming\Wrapper\ProtoWriteFormat.cs" />
    164     <Compile Include="LinearProgramming\Wrapper\ResultStatus.cs" />
    165     <Compile Include="LinearProgramming\Views\LinearProgrammingProblemView.cs">
    166       <SubType>UserControl</SubType>
    167     </Compile>
    168     <Compile Include="LinearProgramming\Views\LinearProgrammingProblemView.Designer.cs">
    169       <DependentUpon>LinearProgrammingProblemView.cs</DependentUpon>
    170     </Compile>
    171     <Compile Include="LinearProgramming\Problems\LinearProgrammingProblemDefinitionScript.cs" />
    172     <Compile Include="LinearProgramming\Templates\CompiledLinearProgrammingProblemDefinition.cs" />
     150    <Compile Include="LinearProgramming\Algorithms\LinearSolverExtensions.cs" />
     151    <Compile Include="LinearProgramming\Algorithms\OptimizationProblemType.cs" />
     152    <Compile Include="LinearProgramming\Algorithms\Solvers\Base\LinearSolver.cs" />
     153    <Compile Include="LinearProgramming\Algorithms\DoubleParam.cs" />
     154    <Compile Include="LinearProgramming\Algorithms\ProtoWriteFormat.cs" />
     155    <Compile Include="LinearProgramming\Algorithms\ResultStatus.cs" />
     156    <Compile Include="LinearProgramming\Problems\ProgrammableLinearProgrammingProblemDefinition.cs" />
     157    <Resource Include="LinearProgramming\Templates\CompiledLinearProgrammingProblemDefinition.cs" />
    173158    <Compile Include="LinearProgramming\Templates\ScriptTemplates.Designer.cs">
    174159      <AutoGen>True</AutoGen>
    … …  
    176161      <DependentUpon>ScriptTemplates.resx</DependentUpon>
    177162    </Compile>
    178     <Compile Include="LinearProgramming\Wrapper\SolverResponseStatus.cs" />
     163    <Compile Include="LinearProgramming\Algorithms\SolverResponseStatus.cs" />
    179164    <Compile Include="Properties\AssemblyInfo.cs" />
    180165    <Compile Include="Properties\Settings.Designer.cs">
    … …  
    201186      <Generator>ResXFileCodeGenerator</Generator>
    202187      <LastGenOutput>ScriptTemplates.Designer.cs</LastGenOutput>
    203     </EmbeddedResource>
    204     <EmbeddedResource Include="LinearProgramming\Views\LinearProgrammingProblemView.resx">
    205       <DependentUpon>LinearProgrammingProblemView.cs</DependentUpon>
     188      <SubType>Designer</SubType>
    206189    </EmbeddedResource>
    207190  </ItemGroup>
    … …  
    211194      <Name>HeuristicLab.Analysis-3.3</Name>
    212195    </ProjectReference>
    213     <ProjectReference Include="..\..\HeuristicLab.CodeEditor\3.4\HeuristicLab.CodeEditor-3.4.csproj">
    214       <Project>{C38691AE-ECB4-489A-A05D-B035554E0168}</Project>
    215       <Name>HeuristicLab.CodeEditor-3.4</Name>
    216     </ProjectReference>
    217196    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    218197      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    … …  
    227206      <Name>HeuristicLab.Common-3.3</Name>
    228207    </ProjectReference>
    229     <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    230       <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    231       <Name>HeuristicLab.Core.Views-3.3</Name>
    232     </ProjectReference>
    233208    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    234209      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    … …  
    239214      <Name>HeuristicLab.Data-3.3</Name>
    240215    </ProjectReference>
    241     <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    242       <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    243       <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
    244     </ProjectReference>
    245     <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    246       <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    247       <Name>HeuristicLab.MainForm-3.3</Name>
    248     </ProjectReference>
    249216    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    250217      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    … …  
    266233      <Project>{EE07BFF8-B23D-41F5-8AD7-AC9598D7A2C9}</Project>
    267234      <Name>HeuristicLab.Problems.Programmable-3.3</Name>
    268     </ProjectReference>
    269     <ProjectReference Include="..\..\HeuristicLab.Scripting.Views\3.3\HeuristicLab.Scripting.Views-3.3.csproj">
    270       <Project>{0C2917C8-7AA8-4E18-800A-C4D064F992ED}</Project>
    271       <Name>HeuristicLab.Scripting.Views-3.3</Name>
    272235    </ProjectReference>
    273236    <ProjectReference Include="..\..\HeuristicLab.Scripting\3.3\HeuristicLab.Scripting-3.3.csproj">
Note: See TracChangeset for help on using the changeset viewer.