Changeset 10359

Timestamp:

01/20/14 17:56:51 (11 years ago)

Author:

jkarder

Message:

#2136: merged HLScript branch back to trunk

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• HeuristicLab 3.3.sln (modified) (3 diffs)
• HeuristicLab.CodeEditor/3.3/CodeEditor.cs (modified) (3 diffs)
• HeuristicLab.Encodings.IntegerVectorEncoding (modified) (1 prop)
• HeuristicLab.Encodings.PermutationEncoding (modified) (1 prop)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding (modified) (1 prop)
• HeuristicLab.HLScript (copied) (copied from branches/HLScript/HeuristicLab.HLScript)
• HeuristicLab.HLScript.Views (copied) (copied from branches/HLScript/HeuristicLab.HLScript.Views)
• HeuristicLab.Problems.DataAnalysis.Symbolic (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression (modified) (1 prop)
• HeuristicLab.Problems.VehicleRouting (modified) (1 prop)

trunk/sources/HeuristicLab 3.3.sln

@@ -112 +112 @@
     {AB687BBE-1BFE-476B-906D-44237135431D} = {AB687BBE-1BFE-476B-906D-44237135431D}
     {66D249C3-A01D-42A8-82A2-919BC8EC3D83} = {66D249C3-A01D-42A8-82A2-919BC8EC3D83}
+    {21977CC3-1757-4B3B-87BD-FF817AAA900F} = {21977CC3-1757-4B3B-87BD-FF817AAA900F}
     {E4CFB0C3-0589-4893-B38E-8BEDF885C765} = {E4CFB0C3-0589-4893-B38E-8BEDF885C765}
     {E6CB1FC5-78EC-4EB8-BF12-35303C36F962} = {E6CB1FC5-78EC-4EB8-BF12-35303C36F962}
+    {0C2917C8-7AA8-4E18-800A-C4D064F992ED} = {0C2917C8-7AA8-4E18-800A-C4D064F992ED}
     {79271BC8-4446-40E2-BB89-9BE4E17174FE} = {79271BC8-4446-40E2-BB89-9BE4E17174FE}
     {7A2531CE-3F7C-4F13-BCCA-ED6DC27A7086} = {7A2531CE-3F7C-4F13-BCCA-ED6DC27A7086}
@@ -381 +383 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis.Trading.Views-3.4", "HeuristicLab.Problems.DataAnalysis.Trading.Views\3.4\HeuristicLab.Problems.DataAnalysis.Trading.Views-3.4.csproj", "{CB3D0A1E-1BE8-476B-A53C-2B189E30064F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.HLScript-3.3", "HeuristicLab.HLScript\3.3\HeuristicLab.HLScript-3.3.csproj", "{21977CC3-1757-4B3B-87BD-FF817AAA900F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.HLScript.Views-3.3", "HeuristicLab.HLScript.Views\3.3\HeuristicLab.HLScript.Views-3.3.csproj", "{0C2917C8-7AA8-4E18-800A-C4D064F992ED}"
 EndProject
 Global
@@ -1856 +1862 @@
     {CB3D0A1E-1BE8-476B-A53C-2B189E30064F}.Release|x86.ActiveCfg = Release|x86
     {CB3D0A1E-1BE8-476B-A53C-2B189E30064F}.Release|x86.Build.0 = Release|x86
+    {21977CC3-1757-4B3B-87BD-FF817AAA900F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {21977CC3-1757-4B3B-87BD-FF817AAA900F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {21977CC3-1757-4B3B-87BD-FF817AAA900F}.Debug|x64.ActiveCfg = Debug|Any CPU
+    {21977CC3-1757-4B3B-87BD-FF817AAA900F}.Debug|x86.ActiveCfg = Debug|Any CPU
+    {21977CC3-1757-4B3B-87BD-FF817AAA900F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {21977CC3-1757-4B3B-87BD-FF817AAA900F}.Release|Any CPU.Build.0 = Release|Any CPU
+    {21977CC3-1757-4B3B-87BD-FF817AAA900F}.Release|x64.ActiveCfg = Release|Any CPU
+    {21977CC3-1757-4B3B-87BD-FF817AAA900F}.Release|x86.ActiveCfg = Release|Any CPU
+    {0C2917C8-7AA8-4E18-800A-C4D064F992ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {0C2917C8-7AA8-4E18-800A-C4D064F992ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {0C2917C8-7AA8-4E18-800A-C4D064F992ED}.Debug|x64.ActiveCfg = Debug|Any CPU
+    {0C2917C8-7AA8-4E18-800A-C4D064F992ED}.Debug|x86.ActiveCfg = Debug|Any CPU
+    {0C2917C8-7AA8-4E18-800A-C4D064F992ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {0C2917C8-7AA8-4E18-800A-C4D064F992ED}.Release|Any CPU.Build.0 = Release|Any CPU
+    {0C2917C8-7AA8-4E18-800A-C4D064F992ED}.Release|x64.ActiveCfg = Release|Any CPU
+    {0C2917C8-7AA8-4E18-800A-C4D064F992ED}.Release|x86.ActiveCfg = Release|Any CPU
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution

trunk/sources/HeuristicLab.CodeEditor/3.3/CodeEditor.cs

@@ -140 +140 @@
       if (TextEditorValidated != null)
         TextEditorValidated(this, EventArgs.Empty);
+    }
+
+    public event EventHandler TextEditorTextChanged;
+
+    protected void OnTextEditorTextChanged() {
+      if (TextEditorTextChanged != null)
+        TextEditorTextChanged(this, EventArgs.Empty);
     }
 
@@ -188 +195 @@
 
       textEditor.Validated += (s, a) => { OnTextEditorValidated(); };
+      textEditor.TextChanged += (s, a) => { OnTextEditorTextChanged(); };
       InitializeImageList();
     }
@@ -298 +306 @@
     public void AddAssembly(Assembly a) {
       ShowMessage("Loading " + a.GetName().Name + "...");
-      if (assemblies.Contains(a))
-        return;
-      var reference = projectContentRegistry.GetProjectContentForReference(a.GetName().Name, a.Location);
-      projectContent.AddReferencedContent(reference);
-      assemblies.Add(a);
+      if (!assemblies.Contains(a)) {
+        var reference = projectContentRegistry.GetProjectContentForReference(a.GetName().Name, a.Location);
+        projectContent.AddReferencedContent(reference);
+        assemblies.Add(a);
+      }
       ShowMessage("Ready");
     }
     public void RemoveAssembly(Assembly a) {
       ShowMessage("Unloading " + a.GetName().Name + "...");
-      if (!assemblies.Contains(a))
-        return;
-      var content = projectContentRegistry.GetExistingProjectContent(a.Location);
-      if (content != null) {
-        projectContent.ReferencedContents.Remove(content);
-        projectContentRegistry.UnloadProjectContent(content);
+      if (assemblies.Contains(a)) {
+        var content = projectContentRegistry.GetExistingProjectContent(a.Location);
+        if (content != null) {
+          projectContent.ReferencedContents.Remove(content);
+          projectContentRegistry.UnloadProjectContent(content);
+        }
       }
       ShowMessage("Ready");