Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
06/11/19 20:59:44 (5 years ago)
Author:
gkronber
Message:

#2994: merged r16944:16997 from trunk to branch

Location:
branches/2994-AutoDiffForIntervals
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/2994-AutoDiffForIntervals

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Optimizer

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Optimizer/3.3/FileManager.cs

    r16565 r17005  
    2323using System.Collections.Generic;
    2424using System.IO;
     25using System.Linq;
    2526using System.Threading;
    2627using System.Windows.Forms;
     
    7374    }
    7475
    75     private static void LoadingCompleted(IStorableContent content, Exception error) {
     76    private static void LoadingCompleted(IStorableContent content, Exception error, ContentManager.Info info) {
    7677      try {
    7778        if (error != null) throw error;
     79        if (info!=null && info.UnknownTypeGuids.Any()) {
     80          var message = "Unknown type guids: " + string.Join(Environment.NewLine, info.UnknownTypeGuids);
     81          MessageBox.Show((Control)MainFormManager.MainForm, message, $"File {info.Filename} not restored completely", MessageBoxButtons.OK, MessageBoxIcon.Information);
     82        }
    7883        IView view = MainFormManager.MainForm.ShowContent(content);
    7984        if (view == null)
  • branches/2994-AutoDiffForIntervals/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj

    r16658 r17005  
    312312      <Private>False</Private>
    313313    </ProjectReference>
    314     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    315       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    316       <Name>HeuristicLab.Persistence-3.3</Name>
    317       <Private>False</Private>
    318     </ProjectReference>
    319314    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    320315      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
  • branches/2994-AutoDiffForIntervals/HeuristicLab.Optimizer/3.3/Plugin.cs.frame

    r16658 r17005  
    4343  [PluginDependency("HeuristicLab.Optimization", "3.3")]
    4444  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    45   [PluginDependency("HeuristicLab.Persistence", "3.3")]
    4645  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
    4746  public class HeuristicLabOptimizerPlugin : PluginBase {
  • branches/2994-AutoDiffForIntervals/HeuristicLab.Optimizer/3.3/StartPage.cs

    r16565 r17005  
    3030using HeuristicLab.Core;
    3131using HeuristicLab.MainForm;
    32 using HeuristicLab.Persistence.Default.Xml;
    3332
    3433namespace HeuristicLab.Optimizer {
     
    121120        using (var stream = assembly.GetManifestResourceStream(name)) {
    122121          WriteStreamToTempFile(stream, path); // create a file in a temporary folder (persistence cannot load these files directly from the stream)
    123           var item = XmlParser.Deserialize<INamedItem>(path);
     122          var item = (INamedItem)ContentManager.Load(path);
    124123          OnSampleLoaded(item, group, 1.0 / count);
    125124        }
Note: See TracChangeset for help on using the changeset viewer.