Changeset 10359


Ignore:
Timestamp:
01/20/14 17:56:51 (6 years ago)
Author:
jkarder
Message:

#2136: merged HLScript branch back to trunk

Location:
trunk/sources
Files:
9 edited
2 copied

Legend:

Unmodified
Added
Removed
  • trunk/sources

  • trunk/sources/HeuristicLab 3.3.sln

    r9982 r10359  
    112112    {AB687BBE-1BFE-476B-906D-44237135431D} = {AB687BBE-1BFE-476B-906D-44237135431D}
    113113    {66D249C3-A01D-42A8-82A2-919BC8EC3D83} = {66D249C3-A01D-42A8-82A2-919BC8EC3D83}
     114    {21977CC3-1757-4B3B-87BD-FF817AAA900F} = {21977CC3-1757-4B3B-87BD-FF817AAA900F}
    114115    {E4CFB0C3-0589-4893-B38E-8BEDF885C765} = {E4CFB0C3-0589-4893-B38E-8BEDF885C765}
    115116    {E6CB1FC5-78EC-4EB8-BF12-35303C36F962} = {E6CB1FC5-78EC-4EB8-BF12-35303C36F962}
     117    {0C2917C8-7AA8-4E18-800A-C4D064F992ED} = {0C2917C8-7AA8-4E18-800A-C4D064F992ED}
    116118    {79271BC8-4446-40E2-BB89-9BE4E17174FE} = {79271BC8-4446-40E2-BB89-9BE4E17174FE}
    117119    {7A2531CE-3F7C-4F13-BCCA-ED6DC27A7086} = {7A2531CE-3F7C-4F13-BCCA-ED6DC27A7086}
     
    381383EndProject
    382384Project("{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}"
     385EndProject
     386Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.HLScript-3.3", "HeuristicLab.HLScript\3.3\HeuristicLab.HLScript-3.3.csproj", "{21977CC3-1757-4B3B-87BD-FF817AAA900F}"
     387EndProject
     388Project("{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}"
    383389EndProject
    384390Global
     
    18561862    {CB3D0A1E-1BE8-476B-A53C-2B189E30064F}.Release|x86.ActiveCfg = Release|x86
    18571863    {CB3D0A1E-1BE8-476B-A53C-2B189E30064F}.Release|x86.Build.0 = Release|x86
     1864    {21977CC3-1757-4B3B-87BD-FF817AAA900F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1865    {21977CC3-1757-4B3B-87BD-FF817AAA900F}.Debug|Any CPU.Build.0 = Debug|Any CPU
     1866    {21977CC3-1757-4B3B-87BD-FF817AAA900F}.Debug|x64.ActiveCfg = Debug|Any CPU
     1867    {21977CC3-1757-4B3B-87BD-FF817AAA900F}.Debug|x86.ActiveCfg = Debug|Any CPU
     1868    {21977CC3-1757-4B3B-87BD-FF817AAA900F}.Release|Any CPU.ActiveCfg = Release|Any CPU
     1869    {21977CC3-1757-4B3B-87BD-FF817AAA900F}.Release|Any CPU.Build.0 = Release|Any CPU
     1870    {21977CC3-1757-4B3B-87BD-FF817AAA900F}.Release|x64.ActiveCfg = Release|Any CPU
     1871    {21977CC3-1757-4B3B-87BD-FF817AAA900F}.Release|x86.ActiveCfg = Release|Any CPU
     1872    {0C2917C8-7AA8-4E18-800A-C4D064F992ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1873    {0C2917C8-7AA8-4E18-800A-C4D064F992ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
     1874    {0C2917C8-7AA8-4E18-800A-C4D064F992ED}.Debug|x64.ActiveCfg = Debug|Any CPU
     1875    {0C2917C8-7AA8-4E18-800A-C4D064F992ED}.Debug|x86.ActiveCfg = Debug|Any CPU
     1876    {0C2917C8-7AA8-4E18-800A-C4D064F992ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
     1877    {0C2917C8-7AA8-4E18-800A-C4D064F992ED}.Release|Any CPU.Build.0 = Release|Any CPU
     1878    {0C2917C8-7AA8-4E18-800A-C4D064F992ED}.Release|x64.ActiveCfg = Release|Any CPU
     1879    {0C2917C8-7AA8-4E18-800A-C4D064F992ED}.Release|x86.ActiveCfg = Release|Any CPU
    18581880  EndGlobalSection
    18591881  GlobalSection(SolutionProperties) = preSolution
  • trunk/sources/HeuristicLab.CodeEditor/3.3/CodeEditor.cs

    r5287 r10359  
    140140      if (TextEditorValidated != null)
    141141        TextEditorValidated(this, EventArgs.Empty);
     142    }
     143
     144    public event EventHandler TextEditorTextChanged;
     145
     146    protected void OnTextEditorTextChanged() {
     147      if (TextEditorTextChanged != null)
     148        TextEditorTextChanged(this, EventArgs.Empty);
    142149    }
    143150
     
    188195
    189196      textEditor.Validated += (s, a) => { OnTextEditorValidated(); };
     197      textEditor.TextChanged += (s, a) => { OnTextEditorTextChanged(); };
    190198      InitializeImageList();
    191199    }
     
    298306    public void AddAssembly(Assembly a) {
    299307      ShowMessage("Loading " + a.GetName().Name + "...");
    300       if (assemblies.Contains(a))
    301         return;
    302       var reference = projectContentRegistry.GetProjectContentForReference(a.GetName().Name, a.Location);
    303       projectContent.AddReferencedContent(reference);
    304       assemblies.Add(a);
     308      if (!assemblies.Contains(a)) {
     309        var reference = projectContentRegistry.GetProjectContentForReference(a.GetName().Name, a.Location);
     310        projectContent.AddReferencedContent(reference);
     311        assemblies.Add(a);
     312      }
    305313      ShowMessage("Ready");
    306314    }
    307315    public void RemoveAssembly(Assembly a) {
    308316      ShowMessage("Unloading " + a.GetName().Name + "...");
    309       if (!assemblies.Contains(a))
    310         return;
    311       var content = projectContentRegistry.GetExistingProjectContent(a.Location);
    312       if (content != null) {
    313         projectContent.ReferencedContents.Remove(content);
    314         projectContentRegistry.UnloadProjectContent(content);
     317      if (assemblies.Contains(a)) {
     318        var content = projectContentRegistry.GetExistingProjectContent(a.Location);
     319        if (content != null) {
     320          projectContent.ReferencedContents.Remove(content);
     321          projectContentRegistry.UnloadProjectContent(content);
     322        }
    315323      }
    316324      ShowMessage("Ready");
  • trunk/sources/HeuristicLab.Encodings.IntegerVectorEncoding

  • trunk/sources/HeuristicLab.Encodings.PermutationEncoding

  • trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression

  • trunk/sources/HeuristicLab.Problems.VehicleRouting

Note: See TracChangeset for help on using the changeset viewer.