Free cookie consent management tool by TermsFeed Policy Generator

Changeset 18044


Ignore:
Timestamp:
08/16/21 17:16:25 (3 years ago)
Author:
dpiringe
Message:

#3026

  • adjusted the necessary plugin dependencies for all three JsonInterface projects (depending on CheckPluginDependenciesForReferencedAssemblies and CheckReferenceAssembliesForPluginDependencies tests)
  • using now the error handling dialog in FileManager
  • added a AggregateException in RegressionProblemDataConverter for unconvertable values
Location:
branches/3026_IntegrationIntoSymSpace
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.App/HeuristicLab.JsonInterface.App.csproj

    r18042 r18044  
    4040    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
    4141      <HintPath>..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
    42     </Reference>
    43     <Reference Include="HEAL.Attic, Version=1.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    44       <HintPath>..\packages\HEAL.Attic.1.4.0\lib\net461\HEAL.Attic.dll</HintPath>
    45       <Private>False</Private>
    4642    </Reference>
    4743    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
    … …  
    9591      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    9692      <Name>HeuristicLab.Common-3.3</Name>
    97       <Private>False</Private>
    9893    </ProjectReference>
    9994    <ProjectReference Include="..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    … …  
    122117      <Private>False</Private>
    123118    </ProjectReference>
    124     <ProjectReference Include="..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
    125       <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
    126       <Name>HeuristicLab.Problems.Instances-3.3</Name>
    127       <Private>False</Private>
    128     </ProjectReference>
    129119  </ItemGroup>
    130120  <ItemGroup>

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.App/Plugin.cs.frame

    r18041 r18044  
    2727  [Plugin("HeuristicLab.JsonInterface.App", "3.3.16.0")]
    2828  [PluginFile("HeuristicLab.JsonInterface.App.dll", PluginFileType.Assembly)]
    29   [PluginDependency("HeuristicLab.Attic", "1.0")]
    3029  [PluginDependency("HeuristicLab.JsonInterface", "3.3")]
    3130  [PluginDependency("HeuristicLab.Optimization", "3.3")]
    3231  [PluginDependency("HeuristicLab.Collections", "3.3")]
    33   [PluginDependency("HeuristicLab.Common", "3.3")]
     32  //[PluginDependency("HeuristicLab.Common", "3.3")]
    3433  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
    3534  [PluginDependency("HeuristicLab.Core", "3.3")]
    3635  [PluginDependency("HeuristicLab.ParallelEngine", "3.3")]
    37   [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
     36  //[PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
    3837  public class HeuristicLabJsonInterfaceAppPlugin : PluginBase {
    3938  }

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/FileManager.cs

    r18043 r18044  
    2121      if (!view.Locked && content != null) {
    2222        if(content is IOptimizer) {
    23           exportDialog.Content = content;
    24           exportDialog.ShowDialog();
     23          try {
     24            exportDialog.Content = content;
     25            exportDialog.ShowDialog();
     26          } catch (Exception e) {
     27            ErrorHandling.ShowErrorDialog(e);
     28          }
    2529        } else {
    2630          MessageBox.Show("This cannot item cannot be converted.", "Unsupported Item", MessageBoxButtons.OK);

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/MenuItems/ExportJsonTemplateMenuItem.cs

    r17331 r18044  
    11using System;
    22using System.Collections.Generic;
    3 using System.Linq;
    4 using System.Text;
    5 using System.Threading.Tasks;
    63using System.Windows.Forms;
    74using HeuristicLab.Common;

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Plugin.cs.frame

    r17331 r18044  
    2626  [Plugin("HeuristicLab.JsonInterface.OptimizerIntegration", "3.3.16.0")]
    2727  [PluginFile("HeuristicLab.JsonInterface.OptimizerIntegration.dll", PluginFileType.Assembly)]
    28   [PluginDependency("HeuristicLab.Attic", "1.0")]
     28  //[PluginDependency("HeuristicLab.Attic", "1.0")]
    2929  [PluginDependency("HeuristicLab.JsonInterface", "3.3")]
    3030  [PluginDependency("HeuristicLab.Common", "3.3")]
     31  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
    3132  [PluginDependency("HeuristicLab.Core", "3.3")]
    3233  [PluginDependency("HeuristicLab.Optimization", "3.3")]

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/RegressionProblemDataConverter.cs

    r18043 r18044  
    244244
    245245        int r = 0;
    246         foreach (var callValue in x.Value) {
    247           matrix[c][r] = (T)callValue;
     246        foreach (var cellValue in x.Value) {
     247          try {
     248            matrix[c][r] = (T)cellValue;
     249          } catch (Exception e) {
     250            throw new AggregateException($"The cell value '{cellValue}' in row {r} cannot be converted to {typeof(T).FullName}.", e);
     251          }
    248252          ++r;
    249253        }

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/HeuristicLab.JsonInterface.csproj

    r18042 r18044  
    139139    </ProjectReference>
    140140    <ProjectReference Include="..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    141       <Project>{a9ad58b9-3ef9-4cc1-97e5-8d909039ff5c}</Project>
     141      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    142142      <Name>HeuristicLab.Common-3.3</Name>
    143143    </ProjectReference>
    … …  
    178178      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
    179179    </ProjectReference>
    180     <ProjectReference Include="..\HeuristicLab.Problems.Instances.DataAnalysis\3.3\HeuristicLab.Problems.Instances.DataAnalysis-3.3.csproj">
    181       <Project>{94c7714e-29d4-4d6d-b213-2c18d627ab75}</Project>
    182       <Name>HeuristicLab.Problems.Instances.DataAnalysis-3.3</Name>
    183     </ProjectReference>
    184180  </ItemGroup>
    185181  <ItemGroup />

  • branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Plugin.cs.frame

    r18041 r18044  
    2828  [PluginDependency("HeuristicLab.Attic", "1.0")]
    2929  [PluginDependency("HeuristicLab.Collections", "3.3")]
    30   [PluginDependency("HeuristicLab.Common", "3.3")]
     30  //[PluginDependency("HeuristicLab.Common", "3.3")]
    3131  [PluginDependency("HeuristicLab.Core", "3.3")]
    3232  [PluginDependency("HeuristicLab.Data", "3.3")]
    … …  
    3737  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic", "3.4")]
    3838  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic.Regression", "3.4")]
    39   [PluginDependency("HeuristicLab.Problems.Instances.DataAnalysis", "3.3")]
     39  //[PluginDependency("HeuristicLab.Problems.Instances.DataAnalysis", "3.3")]
    4040  public class HeuristicLabJsonInterfacePlugin : PluginBase {
    4141  }
Note: See TracChangeset for help on using the changeset viewer.