- Timestamp:
- 06/11/19 20:59:44 (6 years ago)
- Location:
- branches/2994-AutoDiffForIntervals
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2994-AutoDiffForIntervals
- Property svn:mergeinfo changed
/trunk merged: 16944-16945,16978-16983,16992,16997
- Property svn:mergeinfo changed
-
branches/2994-AutoDiffForIntervals/HeuristicLab.Optimizer
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Optimizer (added) merged: 16992,16997
- Property svn:mergeinfo changed
-
branches/2994-AutoDiffForIntervals/HeuristicLab.Optimizer/3.3/FileManager.cs
r16565 r17005 23 23 using System.Collections.Generic; 24 24 using System.IO; 25 using System.Linq; 25 26 using System.Threading; 26 27 using System.Windows.Forms; … … 73 74 } 74 75 75 private static void LoadingCompleted(IStorableContent content, Exception error ) {76 private static void LoadingCompleted(IStorableContent content, Exception error, ContentManager.Info info) { 76 77 try { 77 78 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 } 78 83 IView view = MainFormManager.MainForm.ShowContent(content); 79 84 if (view == null) -
branches/2994-AutoDiffForIntervals/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj
r16658 r17005 312 312 <Private>False</Private> 313 313 </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>319 314 <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj"> 320 315 <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project> -
branches/2994-AutoDiffForIntervals/HeuristicLab.Optimizer/3.3/Plugin.cs.frame
r16658 r17005 43 43 [PluginDependency("HeuristicLab.Optimization", "3.3")] 44 44 [PluginDependency("HeuristicLab.Parameters", "3.3")] 45 [PluginDependency("HeuristicLab.Persistence", "3.3")]46 45 [PluginDependency("HeuristicLab.Problems.Instances", "3.3")] 47 46 public class HeuristicLabOptimizerPlugin : PluginBase { -
branches/2994-AutoDiffForIntervals/HeuristicLab.Optimizer/3.3/StartPage.cs
r16565 r17005 30 30 using HeuristicLab.Core; 31 31 using HeuristicLab.MainForm; 32 using HeuristicLab.Persistence.Default.Xml;33 32 34 33 namespace HeuristicLab.Optimizer { … … 121 120 using (var stream = assembly.GetManifestResourceStream(name)) { 122 121 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); 124 123 OnSampleLoaded(item, group, 1.0 / count); 125 124 }
Note: See TracChangeset
for help on using the changeset viewer.