- Timestamp:
- 03/28/19 16:54:20 (6 years ago)
- Location:
- branches/2521_ProblemRefactoring
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2521_ProblemRefactoring
- Property svn:mergeinfo changed
-
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/2520_PersistenceReintegration/HeuristicLab.Clients.Hive merged eligible /branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive merged eligible /branches/2947_ConfigurableIndexedDataTable/HeuristicLab.Clients.Hive merged eligible /branches/2965_CancelablePersistence/HeuristicLab.Clients.Hive merged eligible /stable/HeuristicLab.Clients.Hive merged eligible /trunk/HeuristicLab.Clients.Hive merged eligible /branches/1721-RandomForestPersistence/HeuristicLab.Clients.Hive 10321-10322 /branches/2892_LR-prediction-intervals/HeuristicLab.Clients.Hive 15743-16388 /branches/2915-AbsoluteSymbol/HeuristicLab.Clients.Hive 15943-16355 /branches/Algorithms.GradientDescent/HeuristicLab.Clients.Hive 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Clients.Hive 6917-7005 /branches/CloningRefactoring/HeuristicLab.Clients.Hive 4656-4721 /branches/CodeEditor/HeuristicLab.Clients.Hive 11700-11806 /branches/DataAnalysis Refactoring/HeuristicLab.Clients.Hive 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Clients.Hive 5815-6180 /branches/DataAnalysis/HeuristicLab.Clients.Hive 4458-4459,4462,4464 /branches/DataPreprocessing/HeuristicLab.Clients.Hive 10085-11101 /branches/GP.Grammar.Editor/HeuristicLab.Clients.Hive 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Clients.Hive 5060 /branches/HLScript/HeuristicLab.Clients.Hive 10331-10358 /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Clients.Hive 11570-12508 /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Clients.Hive 6123-9799 /branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Clients.Hive 11130-12721 /branches/HiveProjectManagement/HeuristicLab.Clients.Hive 15377-15760 /branches/HiveStatistics/sources/HeuristicLab.Clients.Hive 12440-12877 /branches/LogResidualEvaluator/HeuristicLab.Clients.Hive 10202-10483 /branches/NET40/sources/HeuristicLab.Clients.Hive 5138-5162 /branches/NSGA-II Changes/HeuristicLab.Clients.Hive 12033-12122 /branches/ParallelEngine/HeuristicLab.Clients.Hive 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Clients.Hive 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Clients.Hive 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Clients.Hive 6828 /branches/RuntimeOptimizer/HeuristicLab.Clients.Hive 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Clients.Hive 7787-8333 /branches/SlaveShutdown/HeuristicLab.Clients.Hive 8944-8956 /branches/SpectralKernelForGaussianProcesses/HeuristicLab.Clients.Hive 10204-10479 /branches/SuccessProgressAnalysis/HeuristicLab.Clients.Hive 5370-5682 /branches/Trunk/HeuristicLab.Clients.Hive 6829-6865 /branches/UnloadJobs/HeuristicLab.Clients.Hive 9168-9215 /branches/VNS/HeuristicLab.Clients.Hive 5594-5752 /branches/crossvalidation-2434/HeuristicLab.Clients.Hive 12948-12950 /branches/histogram/HeuristicLab.Clients.Hive 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive/3.3/Util/PersistenceUtil.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using System.Collections.Generic; 24 24 using System.IO; 25 using H euristicLab.Persistence.Core;25 using HEAL.Attic; 26 26 using HeuristicLab.Persistence.Default.Xml; 27 27 … … 29 29 public static class PersistenceUtil { 30 30 public static byte[] Serialize(object obj, out IEnumerable<Type> types) { 31 using (MemoryStream memStream = new MemoryStream()) { 32 XmlGenerator.Serialize(obj, memStream, ConfigurationService.Instance.GetConfiguration(new XmlFormat()), false, out types); 33 byte[] jobByteArray = memStream.ToArray(); 34 return jobByteArray; 35 } 31 var ser = new ProtoBufSerializer(); 32 var bytes = ser.Serialize(obj, out SerializationInfo info); 33 types = info.SerializedTypes; 34 return bytes; 36 35 } 37 36 38 37 public static byte[] Serialize(object obj) { 39 using (MemoryStream memStream = new MemoryStream()) { 40 XmlGenerator.Serialize(obj, memStream); 41 byte[] jobByteArray = memStream.ToArray(); 42 return jobByteArray; 43 } 38 var ser = new ProtoBufSerializer(); 39 return ser.Serialize(obj); 44 40 } 45 41 46 42 public static T Deserialize<T>(byte[] sjob) { 47 using (MemoryStream memStream = new MemoryStream(sjob)) { 48 T job = XmlParser.Deserialize<T>(memStream); 49 return job; 43 var ser = new ProtoBufSerializer(); 44 try { 45 return (T)ser.Deserialize(sjob); 46 } catch (Exception) { 47 // retry with old persistence 48 using (MemoryStream memStream = new MemoryStream(sjob)) { 49 return XmlParser.Deserialize<T>(memStream); 50 } 50 51 } 51 52 } -
branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive/3.3/Util/PluginUtil.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab.
Note: See TracChangeset
for help on using the changeset viewer.