Changeset 16662 for branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Scripting

Timestamp:

03/07/19 17:42:41 (6 years ago)

Author:

gkronber

Message:

#2925: merged all changes from trunk to branch (up to r16659)

Location:

branches/2925_AutoDiffForDynamicalModels

Files:

• . (modified) (1 prop)
• HeuristicLab.Scripting (modified) (1 prop)
• HeuristicLab.Scripting/3.3/CompilationException.cs (modified) (1 diff)
• HeuristicLab.Scripting/3.3/ExecutableScript.cs (modified) (3 diffs)
• HeuristicLab.Scripting/3.3/HeuristicLab.Scripting-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Scripting/3.3/Plugin.cs.frame (modified) (2 diffs)
• HeuristicLab.Scripting/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)
• HeuristicLab.Scripting/3.3/Script.cs (modified) (3 diffs)
• HeuristicLab.Scripting/3.3/Scripts/CSharp/CSharpScript.cs (modified) (3 diffs)
• HeuristicLab.Scripting/3.3/Scripts/CSharp/CSharpScriptBase.cs (modified) (1 diff)
• HeuristicLab.Scripting/3.3/Scripts/Templates/CSharpScriptTemplate.cs (modified) (1 diff)
• HeuristicLab.Scripting/3.3/VariableStore.cs (modified) (4 diffs)

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Scripting/3.3/CompilationException.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Scripting/3.3/ExecutableScript.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -24 +24 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Scripting {
   [Item("Executable Script", "An executable script.")]
-  [StorableClass]
+  [StorableType("206BFDFE-A829-424E-BFAD-BB7993830325")]
   public abstract class ExecutableScript : Script {
     private Thread scriptThread;
@@ -47 +47 @@
     #region Construction & Cloning
     [StorableConstructor]
-    protected ExecutableScript(bool deserializing) : base(deserializing) { }
+    protected ExecutableScript(StorableConstructorFlag _) : base(_) { }
     protected ExecutableScript(ExecutableScript original, Cloner cloner)
       : base(original, cloner) {

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Scripting/3.3/HeuristicLab.Scripting-3.3.csproj

@@ -10 +10 @@
     <RootNamespace>HeuristicLab.Scripting</RootNamespace>
     <AssemblyName>HeuristicLab.Scripting-3.3</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
@@ -151 +151 @@
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\bin\HEAL.Attic.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Scripting/3.3/Plugin.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -29 +29 @@
   [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
   [PluginDependency("HeuristicLab.Core", "3.3")]
-  [PluginDependency("HeuristicLab.Persistence", "3.3")]
+  [PluginDependency("HeuristicLab.Attic", "1.0")]
   public class HeuristicLabScriptingPlugin : PluginBase {
   }

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Scripting/3.3/Properties/AssemblyInfo.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Scripting/3.3/Script.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -32 +32 @@
 using HeuristicLab.Common.Resources;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using Microsoft.CSharp;
 
 namespace HeuristicLab.Scripting {
-  [StorableClass]
+  [StorableType("0FA4F218-E1F5-4C09-9C2F-12B32D4EC373")]
   public abstract class Script : NamedItem, IProgrammableItem {
     #region Fields & Properties
@@ -66 +66 @@
     #region Construction & Initialization
     [StorableConstructor]
-    protected Script(bool deserializing) : base(deserializing) { }
+    protected Script(StorableConstructorFlag _) : base(_) { }
     protected Script(Script original, Cloner cloner)
       : base(original, cloner) {

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Scripting/3.3/Scripts/CSharp/CSharpScript.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -25 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Scripting {
   [Item("C# Script", "An empty C# script.")]
   [Creatable(CreatableAttribute.Categories.Scripts, Priority = 100)]
-  [StorableClass]
+  [StorableType("1630933C-AB5B-44EC-A967-C299CC57E4E3")]
   public class CSharpScript : ExecutableScript, IStorableContent {
     #region Fields & Properties
@@ -49 +49 @@
     #region Construction & Cloning
     [StorableConstructor]
-    protected CSharpScript(bool deserializing) : base(deserializing) { }
+    protected CSharpScript(StorableConstructorFlag _) : base(_) { }
     protected CSharpScript(CSharpScript original, Cloner cloner)
       : base(original, cloner) {

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Scripting/3.3/Scripts/CSharp/CSharpScriptBase.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Scripting/3.3/Scripts/Templates/CSharpScriptTemplate.cs

@@ -6 +6 @@
 // use 'variables' to work with IEnumerable<T> extension methods on the script's variable store
 
-using System;
-using System.Linq;
-using System.Collections.Generic;
 
-using HeuristicLab.Core;
-using HeuristicLab.Common;
 //using HeuristicLab.Collections;
 //using HeuristicLab.Data;

branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Scripting/3.3/VariableStore.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -27 +27 @@
 using HeuristicLab.Common.Resources;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HeuristicLab.Persistence.Default.Xml;
 
 namespace HeuristicLab.Scripting {
   [Item("VariableStore", "Represents a variable store.")]
-  [StorableClass]
+  [StorableType("DDE415E7-99FD-4C10-9B5E-63334876FFDE")]
   public class VariableStore : ObservableDictionary<string, object>, IItem {
     #region Properties
@@ -55 +54 @@
     #region Constructors & Cloning
     [StorableConstructor]
-    protected VariableStore(bool deserializing) : base(deserializing) { }
+    protected VariableStore(StorableConstructorFlag _) : base(_) { }
     protected VariableStore(VariableStore original, Cloner cloner) {
       cloner.RegisterClonedObject(original, this);
@@ -82 +81 @@
     protected T CloneByPersistence<T>(T value) {
       using (var serializerStream = new MemoryStream()) {
-        XmlGenerator.Serialize(value, serializerStream);
+        var serializer = new ProtoBufSerializer();
+        serializer.Serialize(value, serializerStream, disposeStream: false);
         var bytes = serializerStream.GetBuffer();
         using (var deserializerStream = new MemoryStream(bytes)) {
-          return XmlParser.Deserialize<T>(deserializerStream);
+          return (T)serializer.Deserialize(deserializerStream);
         }
       }