Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
06/23/15 12:50:05 (9 years ago)
Author:
gkronber
Message:

#2261: merged trunk changes to branch
r12494
#2403: added a null check in the MatlabParameterVectorEvaluator to prevent exceptions when clearstate is called


r12493
#2369: added support for squared errors and relative errors to error-characteristic-curve view


r12492
#2392: implemented PearsonsRCalculator to fix incorrect correlation values in the correlation matrix.


r12491
#2402 don't set task state to waiting when it fails


r12490
#2401 added missing Mono.Cecil plugin dependency


r12488
#2400 - Interfaces for Capaciated-, PickupAndDelivery- and TimeWindowed-ProblemInstances now specify an additional penalty parameter to set the current penalty factor for the constraint relaxation. - The setter of the penalty-property in ...


r12485
#2374 made RegressionSolution and ClassificationSolution non-abstract


r12482
#2320: Fixed warnings in unit test solutions introduced in r12420 by marking methods as obsolete.


r12481
#2320: Fixed AfterDeserialization of GEArtifialAntEvaluator.


r12480
#2320: Fixed error in symbolicexpressiontree crossover regarding the wiring of lookup parameters if persisted file is loaded.


r12479
#2397 moved GeoIP project into ExtLibs


r12478
#2329 fixed bug in simple code editor


r12476
#2331 removed outdated plugins


r12475
#2368 fixed compile warnings


r12474
#2399 worked on Mono project prepare script


r12473
#2329 added a simple code editor for Linux


r12472
#2399 - fixed MathJax.js file name - worked on Mono project prepare script


r12471
#2399 worked on Mono project prepare script


r12470
#2399 fixed pre-build events in project files


r12465
#2399 worked on mono project prepare script


r12464
#2399 added patch to project


r12463
#2399 fixed EPPlus so that it compiles on Linux


r12461
#2398: Skip root and start symbols when calculating impacts and replacement values in the pruning operators.


r12458
#2354 show label when no data is displayed and don't show the legend


r12457
#2353 removed duplicated call to Any() in Hive Status page


r12456
#2368 fixed modifier


r12455
#2368 added support in persistence for typecaches in streams


r12445
#2394: Changed Web.config compilation from debug to release to force script bundling. Changed history loading type from lazy to eager loading to increase performance. Fixed "getCoreStatus" typo in statusCtrl.js


r12443
#2394: Fixed UserTaskQuery and GetStatusHistory in the WebApp.Status plugin


r12442
#2394 added nuget folders to svn ignore list


r12435
#2394: Improved PluginManager and updated hive status monitor.


r12434
#2396 added symbolic expression tree formatter for C#


r12433
#2395: Minor change in DoubleValue.GetValue.


r12432
#2395 Use simple round-trip format for doubles because G17 prints some strange numbers (20.22 to 20.219999999999999999). Some accuracy can still be lost on 64bit machines, but should be very rare and minimal. double.MaxValue can still be pa...


r12431
#2395 Fixed parsing issues by using the G17 format.


r12430
#2394 added missing package config


r12429
#2394 added missing package config


r12428
#2394 added web app and status page to trunk


r12424
#2320: Adapted plugin file and updated project file of SymbolicExpressionTreeEncoding.


r12422
#2320: Merged the encoding class and all accompanying changes in the trunk.


r12401
#2387 Fixed a bug where the automatic selection of the first element behaved differently for the NewItemDialog.


r12400
#2387 Forgot to commit a file.


r12399
#2387 - Added context-menu for expanding and collapsing tree-nodes. - Improve response time when expanding/collapsing all nodes for TypeSelector and NewItemDialog.


r12398
#2387 - Added clearSearch-button in TypeSelector. - Adapted behavior of TypeSelector and NewItemDialog that a selected node stays selected as long as it matches the search criteria.


r12397
#2387 - Adapted behavior of the matching in the TypeSelector that it behave the same as the NewItemDialog. The search string is tokenized by space and matches if all tokens are contained, (eg. "Sym Reg" matches "SymbolicRegression...")...


r12393
#2025 - Removed Expand/CollapseAll buttons. - Removed cycling of items.


r12392
#2386: Updated GetHashCode method in the EnumerableBoolEqualityComparer.


Location:
branches/GBT
Files:
4 edited
3 copied

Legend:

Unmodified
Added
Removed
  • branches/GBT

  • branches/GBT/HeuristicLab.CodeEditor/3.4/CodeEditor.cs

    r12012 r12495  
    2727using System.Threading.Tasks;
    2828using System.Windows.Documents;
    29 using HeuristicLab.Common;
    3029using ICSharpCode.AvalonEdit;
    3130using ICSharpCode.AvalonEdit.AddIn;
     
    3736using ICSharpCode.AvalonEdit.Search;
    3837using ICSharpCode.NRefactory.Editor;
    39 using ICSharpCode.NRefactory.TypeSystem;
    4038using ICSharpCode.SharpDevelop.Editor;
    4139using Forms = System.Windows.Forms;
     
    4442
    4543namespace HeuristicLab.CodeEditor {
    46   public partial class CodeEditor : Forms.UserControl {
     44  public partial class CodeEditor : CodeEditorBase {
    4745    private static readonly Media.Color WarningColor = Media.Colors.Blue;
    4846    private static readonly Media.Color ErrorColor = Media.Colors.Red;
     
    7371    private ITextMarker prefixMarker;
    7472    private string prefix = string.Empty;
    75     public string Prefix {
     73    public override string Prefix {
    7674      get { return prefix; }
    7775      set {
     
    9189    private ITextMarker suffixMarker;
    9290    private string suffix = string.Empty;
    93     public string Suffix {
     91    public override string Suffix {
    9492      get { return suffix; }
    9593      set {
     
    108106    }
    109107
    110     public string UserCode {
     108    public override string UserCode {
    111109      get { return Doc.GetText(prefix.Length, Doc.TextLength - suffix.Length - prefix.Length); }
    112110      set {
     
    163161    #endregion
    164162
    165     public bool ReadOnly {
     163    public override bool ReadOnly {
    166164      get { return TextEditor.IsReadOnly; }
    167165      set { TextEditor.IsReadOnly = value; }
     
    259257
    260258    #region Assembly Management
    261     public void AddAssembly(Assembly a) {
     259    public override void AddAssembly(Assembly a) {
    262260      assemblyLoader.AddAssembly(a);
    263261    }
    264262
    265     public void AddAssemblies(IEnumerable<Assembly> assemblies) {
     263    public override void AddAssemblies(IEnumerable<Assembly> assemblies) {
    266264      assemblyLoader.AddAssemblies(assemblies);
    267265    }
    268266
    269     public async Task AddAssembliesAsync(IEnumerable<Assembly> assemblies) {
     267    public override async Task AddAssembliesAsync(IEnumerable<Assembly> assemblies) {
    270268      await assemblyLoader.AddAssembliesAsync(assemblies);
    271269    }
    272270
    273     public void RemoveAssembly(Assembly a) {
     271    public override void RemoveAssembly(Assembly a) {
    274272      assemblyLoader.RemoveAssembly(a);
    275273    }
    276274    #endregion
    277275
    278     public void ScrollToPosition(int line, int column) {
     276    public override void ScrollToPosition(int line, int column) {
    279277      var segment = GetSegmentAtLocation(line, column);
    280278      TextEditor.CaretOffset = segment.Offset + segment.Length;
     
    282280    }
    283281
    284     public void ScrollAfterPrefix() {
     282    public override void ScrollAfterPrefix() {
    285283      var location = Doc.GetLocation(prefix.Length);
    286284      ScrollToPosition(location.Line, location.Column);
     
    399397
    400398    #region Compiler Errors
    401     public void ShowCompileErrors(CompilerErrorCollection compilerErrors) {
     399    public override void ShowCompileErrors(CompilerErrorCollection compilerErrors) {
    402400      if (compilerErrors == null) return;
    403401
     
    446444      }
    447445    }
    448 
    449     #region Events
    450     public event EventHandler TextEditorTextChanged;
    451     private void OnTextEditorTextChanged() {
    452       var handler = TextEditorTextChanged;
    453       if (handler != null) handler(this, EventArgs.Empty);
    454     }
    455 
    456     public event EventHandler<EventArgs<IEnumerable<Assembly>>> AssembliesLoading;
    457     private void OnAssembliesLoading(IEnumerable<Assembly> args) {
    458       var handler = AssembliesLoading;
    459       if (handler != null) handler(this, new EventArgs<IEnumerable<Assembly>>(args));
    460     }
    461 
    462     public event EventHandler<EventArgs<IEnumerable<Assembly>>> AssembliesLoaded;
    463     private void OnAssembliesLoaded(IEnumerable<Assembly> args) {
    464       var handler = AssembliesLoaded;
    465       if (handler != null) handler(this, new EventArgs<IEnumerable<Assembly>>(args));
    466     }
    467 
    468     public event EventHandler<EventArgs<IEnumerable<IUnresolvedAssembly>>> InternalAssembliesLoaded;
    469     private void OnInternalAssembliesLoaded(IEnumerable<IUnresolvedAssembly> args) {
    470       var handler = InternalAssembliesLoaded;
    471       if (handler != null) handler(this, new EventArgs<IEnumerable<IUnresolvedAssembly>>(args));
    472     }
    473 
    474     public event EventHandler<EventArgs<IEnumerable<Assembly>>> AssembliesUnloading;
    475     private void OnAssembliesUnloading(IEnumerable<Assembly> args) {
    476       var handler = AssembliesUnloading;
    477       if (handler != null) handler(this, new EventArgs<IEnumerable<Assembly>>(args));
    478     }
    479 
    480     public event EventHandler<EventArgs<IEnumerable<Assembly>>> AssembliesUnloaded;
    481     private void OnAssembliesUnloaded(IEnumerable<Assembly> args) {
    482       var handler = AssembliesUnloaded;
    483       if (handler != null) handler(this, new EventArgs<IEnumerable<Assembly>>(args));
    484     }
    485 
    486     public event EventHandler<EventArgs<IEnumerable<IUnresolvedAssembly>>> InternalAssembliesUnloaded;
    487     private void OnInternalAssembliesUnloaded(IEnumerable<IUnresolvedAssembly> args) {
    488       var handler = InternalAssembliesUnloaded;
    489       if (handler != null) handler(this, new EventArgs<IEnumerable<IUnresolvedAssembly>>(args));
    490     }
    491     #endregion
    492446  }
    493447}
  • branches/GBT/HeuristicLab.CodeEditor/3.4/HeuristicLab.CodeEditor-3.4.csproj

    r11992 r12495  
    136136    <Compile Include="GoToLineDialog.Designer.cs">
    137137      <DependentUpon>GoToLineDialog.cs</DependentUpon>
     138    </Compile>
     139    <Compile Include="CodeEditorBase.cs">
     140      <SubType>UserControl</SubType>
    138141    </Compile>
    139142    <Compile Include="LanguageFeatures\CodeFolding\CodeFoldingResult.cs" />
     
    173176      <DependentUpon>CodeEditor.cs</DependentUpon>
    174177    </Compile>
     178    <Compile Include="SimpleCodeEditor.cs">
     179      <SubType>UserControl</SubType>
     180    </Compile>
     181    <Compile Include="SimpleCodeEditor.Designer.cs">
     182      <DependentUpon>SimpleCodeEditor.cs</DependentUpon>
     183    </Compile>
    175184    <Compile Include="AvalonEditWrapper.xaml.cs">
    176185      <DependentUpon>AvalonEditWrapper.xaml</DependentUpon>
  • branches/GBT/HeuristicLab.CodeEditor/3.4/Plugin.cs.frame

    r12012 r12495  
    2727  [PluginDependency("HeuristicLab.Common", "3.3")]
    2828  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
     29  [PluginDependency("HeuristicLab.NRefactory", "5.5.0")]
     30#if !__MonoCS__
    2931  [PluginDependency("HeuristicLab.AvalonEdit", "5.0.1")]
    30   [PluginDependency("HeuristicLab.NRefactory", "5.5.0")]
     32#endif
    3133  public class HeuristicLabCodeEditorPlugin : PluginBase {
    3234  }
Note: See TracChangeset for help on using the changeset viewer.