Changeset 12969 for branches/gteufl/HeuristicLab.Core
- Timestamp:
- 09/25/15 14:39:59 (9 years ago)
- Location:
- branches/gteufl
- Files:
-
- 86 edited
- 4 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/gteufl
- Property svn:ignore
-
old new 8 8 FxCopResults.txt 9 9 Google.ProtocolBuffers-0.9.1.dll 10 Google.ProtocolBuffers-2.4.1.473.dll 10 11 HeuristicLab 3.3.5.1.ReSharper.user 11 12 HeuristicLab 3.3.6.0.ReSharper.user 12 13 HeuristicLab.4.5.resharper.user 13 14 HeuristicLab.ExtLibs.6.0.ReSharper.user 15 HeuristicLab.Scripting.Development 14 16 HeuristicLab.resharper.user 15 17 ProtoGen.exe … … 17 19 _ReSharper.HeuristicLab 18 20 _ReSharper.HeuristicLab 3.3 21 _ReSharper.HeuristicLab 3.3 Tests 19 22 _ReSharper.HeuristicLab.ExtLibs 20 23 bin 21 24 protoc.exe 22 _ReSharper.HeuristicLab 3.3 Tests 23 Google.ProtocolBuffers-2.4.1.473.dll 25 obj
-
- Property svn:mergeinfo changed
-
Property
svn:global-ignores
set to
*.nuget
packages
- Property svn:ignore
-
branches/gteufl/HeuristicLab.Core
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/HLScript/HeuristicLab.Core merged eligible /branches/HiveStatistics/sources/HeuristicLab.Core merged eligible /stable/HeuristicLab.Core merged eligible /trunk/sources/HeuristicLab.Core merged eligible /branches/1721-RandomForestPersistence/HeuristicLab.Core 10321-10322 /branches/Algorithms.GradientDescent/HeuristicLab.Core 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Core 6917-7005 /branches/CloningRefactoring/HeuristicLab.Core 4656-4721 /branches/CodeEditor/HeuristicLab.Core 11700-11806 /branches/DataAnalysis Refactoring/HeuristicLab.Core 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Core 5815-6180 /branches/DataAnalysis/HeuristicLab.Core 4458-4459,4462,4464 /branches/DataPreprocessing/HeuristicLab.Core 10085-11101 /branches/GP.Grammar.Editor/HeuristicLab.Core 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Core 5060 /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Core 11570-12508 /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Core 6123-9799 /branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Core 11130-12721 /branches/LogResidualEvaluator/HeuristicLab.Core 10202-10483 /branches/NET40/sources/HeuristicLab.Core 5138-5162 /branches/NSGA-II Changes/HeuristicLab.Core 12033-12122 /branches/NewItemDialog/HeuristicLab.Core 12240,12246 /branches/ParallelEngine/HeuristicLab.Core 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Core 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Core 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Core 6828 /branches/RuntimeOptimizer/HeuristicLab.Core 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Core 7787-8333 /branches/SlaveShutdown/HeuristicLab.Core 8944-8956 /branches/SpectralKernelForGaussianProcesses/HeuristicLab.Core 10204-10479 /branches/SuccessProgressAnalysis/HeuristicLab.Core 5370-5682 /branches/Trunk/HeuristicLab.Core 6829-6865 /branches/UnloadJobs/HeuristicLab.Core 9168-9215 /branches/VNS/HeuristicLab.Core 5594-5752 /branches/histogram/HeuristicLab.Core 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/gteufl/HeuristicLab.Core/3.3/Attributes/CreatableAttribute.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 21 21 22 22 using System; 23 using System.Collections.Generic; 24 using System.Linq; 23 25 24 26 namespace HeuristicLab.Core { 25 27 [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)] 26 28 public sealed class CreatableAttribute : Attribute { 29 #region Predefined Categories 30 public static class Categories { 31 public const string SplitToken = "###"; 32 public const string OrderToken = "$$$"; 33 34 public const string Algorithms = "1" + OrderToken + "Algorithms"; 35 public const string PopulationBasedAlgorithms = Algorithms + SplitToken + "1" + OrderToken + "Population Based"; 36 public const string SingleSolutionAlgorithms = Algorithms + SplitToken + "2" + OrderToken + "Single Solution"; 37 38 public const string Problems = "2" + OrderToken + "Problems"; 39 public const string CombinatorialProblems = Problems + SplitToken + "1" + OrderToken + "Combinatorial"; 40 public const string GeneticProgrammingProblems = Problems + SplitToken + "2" + OrderToken + "Genetic Programming"; 41 public const string ExternalEvaluationProblems = Problems + SplitToken + "3" + OrderToken + "External Evaluation"; 42 43 public const string DataAnalysis = "3" + OrderToken + "Data Analysis"; 44 public const string DataAnalysisRegression = DataAnalysis + SplitToken + "1" + OrderToken + "Regression"; 45 public const string DataAnalysisClassification = DataAnalysis + SplitToken + "2" + OrderToken + "Classification"; 46 public const string DataAnalysisEnsembles = DataAnalysis + SplitToken + "3" + OrderToken + "Ensembles"; 47 48 public const string TestingAndAnalysis = "4" + OrderToken + "Testing & Analysis"; 49 public const string TestingAndAnalysisOKB = TestingAndAnalysis + SplitToken + "1" + OrderToken + "OKB"; 50 51 public const string Scripts = "5" + OrderToken + "Scripts"; 52 53 public static string GetFullName(string rawName) { 54 return string.Join(SplitToken, GetTokens(rawName)); 55 } 56 public static string GetName(string rawName) { 57 return GetTokens(rawName).Last(); 58 } 59 public static IEnumerable<string> GetParentRawNames(string rawName) { 60 var tokens = GetTokensWithOrdering(rawName).ToList(); 61 return tokens.Take(tokens.Count - 1); 62 } 63 private static IEnumerable<string> GetTokensWithOrdering(string rawName) { 64 return rawName.Split(new[] { SplitToken }, StringSplitOptions.RemoveEmptyEntries); 65 } 66 private static IEnumerable<string> GetTokens(string rawName) { 67 return GetTokensWithOrdering(rawName) 68 .Select(t => t.Split(new[] { OrderToken }, StringSplitOptions.RemoveEmptyEntries).Last()); 69 } 70 } 71 #endregion 72 27 73 private string category; 28 74 public string Category { … … 36 82 } 37 83 84 public int Priority { get; set; } 85 38 86 public CreatableAttribute() { 39 87 Category = "Other Items"; 88 Priority = int.MaxValue; 40 89 } 41 90 public CreatableAttribute(string category) … … 53 102 else return null; 54 103 } 104 public static int GetPriority(Type type) { 105 var attribs = type.GetCustomAttributes(typeof(CreatableAttribute), false); 106 if (attribs.Length > 0) return ((CreatableAttribute)attribs[0]).Priority; 107 else return int.MaxValue; 108 } 55 109 } 56 110 } -
branches/gteufl/HeuristicLab.Core/3.3/Attributes/ItemAttribute.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Collections/CheckedItemCollection.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Collections/CheckedItemList.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Collections/ConstraintCollection.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Collections/ItemArray.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Collections/ItemCollection.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Collections/ItemDictionary.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 59 59 public ItemDictionary() : base() { } 60 60 public ItemDictionary(int capacity) : base(capacity) { } 61 public ItemDictionary(IEqualityComparer<TKey> comparer) : base(comparer) { } 61 62 public ItemDictionary(IDictionary<TKey, TValue> dictionary) : base(dictionary) { } 63 public ItemDictionary(int capacity, IEqualityComparer<TKey> comparer) : base(capacity, comparer) { } 64 public ItemDictionary(IDictionary<TKey, TValue> dictionary, IEqualityComparer<TKey> comparer) : base(dictionary, comparer) { } 62 65 63 66 public object Clone() { -
branches/gteufl/HeuristicLab.Core/3.3/Collections/ItemList.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Collections/ItemSet.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 52 52 protected ItemSet(ItemSet<T> original, Cloner cloner) { 53 53 cloner.RegisterClonedObject(original, this); 54 set = new HashSet<T>(original.Select( x => cloner.Clone(x)));54 set = new HashSet<T>(original.Select(cloner.Clone), original.set.Comparer); 55 55 } 56 56 public ItemSet() : base() { } -
branches/gteufl/HeuristicLab.Core/3.3/Collections/KeyedItemCollection.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Collections/NamedItemCollection.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 75 75 } 76 76 77 protected v oid RegisterItemEvents(IEnumerable<T> items) {77 protected virtual void RegisterItemEvents(IEnumerable<T> items) { 78 78 foreach (T item in items) { 79 79 if (item != null) { … … 83 83 } 84 84 } 85 pr ivatevoid DeregisterItemEvents(IEnumerable<T> items) {85 protected virtual void DeregisterItemEvents(IEnumerable<T> items) { 86 86 foreach (T item in items) { 87 87 if (item != null) { -
branches/gteufl/HeuristicLab.Core/3.3/Collections/OperationCollection.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Collections/OperatorCollection.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Collections/OperatorList.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Collections/OperatorSet.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Collections/ParameterCollection.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Collections/ReadOnlyCheckedItemCollection.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Collections/ReadOnlyCheckedItemList.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Collections/ReadOnlyItemArray.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Collections/ReadOnlyItemCollection.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Collections/ReadOnlyItemDictionary.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Collections/ReadOnlyItemList.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Collections/ReadOnlyItemSet.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Collections/ReadOnlyKeyedItemCollection.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Collections/ScopeList.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Collections/ValueParameterCollection.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Collections/VariableCollection.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Constraints/ComparisonConstraint.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 37 37 } 38 38 public ComparisonConstraint(IItem constrainedValue, ConstraintOperation comparisonOperation, object comparisonValue, bool active) 39 : base(constrainedValue, comparisonOperation, comparison Operation, active) {39 : base(constrainedValue, comparisonOperation, comparisonValue, active) { 40 40 } 41 41 -
branches/gteufl/HeuristicLab.Core/3.3/Constraints/Constraint.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Constraints/ConstraintOperation.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Constraints/EqualityConstraint.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Constraints/IConstraint.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Constraints/TypeCompatibilityConstraint.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Engine.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Executable.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/ExecutionContext.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/ExecutionState.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/HeuristicLab.Core-3.3.csproj
r9178 r12969 19 19 </UpgradeBackupLocation> 20 20 <IsWebBootstrapper>true</IsWebBootstrapper> 21 <TargetFrameworkVersion>v4. 0</TargetFrameworkVersion>21 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> 22 22 <TargetFrameworkProfile> 23 23 </TargetFrameworkProfile> … … 48 48 </DocumentationFile> 49 49 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 50 <Prefer32Bit>false</Prefer32Bit> 50 51 </PropertyGroup> 51 52 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> … … 60 61 <TreatWarningsAsErrors>false</TreatWarningsAsErrors> 61 62 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 63 <Prefer32Bit>false</Prefer32Bit> 62 64 </PropertyGroup> 63 65 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> … … 69 71 <ErrorReport>prompt</ErrorReport> 70 72 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 73 <Prefer32Bit>false</Prefer32Bit> 71 74 </PropertyGroup> 72 75 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> … … 80 83 <ErrorReport>prompt</ErrorReport> 81 84 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 85 <Prefer32Bit>false</Prefer32Bit> 82 86 </PropertyGroup> 83 87 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> … … 89 93 <ErrorReport>prompt</ErrorReport> 90 94 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 95 <Prefer32Bit>false</Prefer32Bit> 91 96 </PropertyGroup> 92 97 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> … … 100 105 <ErrorReport>prompt</ErrorReport> 101 106 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 107 <Prefer32Bit>false</Prefer32Bit> 102 108 </PropertyGroup> 103 109 <ItemGroup> … … 116 122 <Compile Include="Collections\CheckedItemCollection.cs" /> 117 123 <Compile Include="Collections\CheckedItemList.cs" /> 124 <Compile Include="Collections\DirectedGraph\Arc.cs" /> 125 <Compile Include="Collections\DirectedGraph\DirectedGraph.cs" /> 126 <Compile Include="Collections\DirectedGraph\Vertex.cs" /> 118 127 <Compile Include="Collections\ReadOnlyCheckedItemCollection.cs" /> 119 128 <Compile Include="Collections\ReadOnlyCheckedItemList.cs"> … … 148 157 <Compile Include="Constraints\IConstraint.cs" /> 149 158 <Compile Include="Constraints\TypeCompatibilityConstraint.cs" /> 159 <Compile Include="Interfaces\DirectedGraph\IArc.cs" /> 160 <Compile Include="Interfaces\DirectedGraph\IDirectedGraph.cs" /> 161 <Compile Include="Interfaces\DirectedGraph\IVertex.cs" /> 150 162 <Compile Include="Interfaces\ICheckedMultiOperator.cs" /> 151 163 <Compile Include="Interfaces\IConstrainedValueParameter.cs" /> 164 <Compile Include="Interfaces\IInstrumentedOperator.cs" /> 152 165 <Compile Include="Interfaces\IMultiOperator.cs" /> 153 166 <Compile Include="Interfaces\IFixedValueParameter.cs" /> 154 167 <Compile Include="Interfaces\IOperatorGraphOperator.cs" /> 168 <Compile Include="Interfaces\IProgrammableItem.cs" /> 155 169 <Compile Include="Interfaces\IStatefulItem.cs" /> 156 170 <Compile Include="OperatorExecutionException.cs" /> -
branches/gteufl/HeuristicLab.Core/3.3/Interfaces/IAtomicOperation.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Interfaces/ICheckedItemCollection.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Interfaces/ICheckedItemList.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Interfaces/ICheckedMultiOperator.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Interfaces/IConstrainedValueParameter.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Interfaces/IEngine.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Interfaces/IExecutable.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Interfaces/IExecutionContext.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Interfaces/IFixedValueParameter.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Interfaces/IItem.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Interfaces/IItemArray.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Interfaces/IItemCollection.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Interfaces/IItemDictionary.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Interfaces/IItemList.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Interfaces/IItemSet.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Interfaces/IKeyedItemCollection.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Interfaces/ILog.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Interfaces/ILookupParameter.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Interfaces/IMultiOperator.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Interfaces/INamedItem.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Interfaces/IOperation.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Interfaces/IOperator.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Interfaces/IOperatorGraphOperator.cs
r9178 r12969 2 2 3 3 /* HeuristicLab 4 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)4 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 5 5 * 6 6 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Interfaces/IParameter.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Interfaces/IParameterizedItem.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Interfaces/IParameterizedNamedItem.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Interfaces/IRandom.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Interfaces/IScope.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Interfaces/IScopeTreeLookupParameter.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Interfaces/IStatefulItem.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Interfaces/IValueLookupParameter.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Interfaces/IValueParameter.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Interfaces/IVariable.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Item.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/Log.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 30 30 [Item("Log", "A log for logging string messages.")] 31 31 [StorableClass] 32 public class Log : Item, ILog, IStorableContent {32 public sealed class Log : Item, ILog, IStorableContent { 33 33 public string Filename { get; set; } 34 34 … … 38 38 39 39 [Storable] 40 pr otectedIList<string> messages;41 public virtualIEnumerable<string> Messages {40 private IList<string> messages; 41 public IEnumerable<string> Messages { 42 42 get { return messages; } 43 43 } 44 44 45 45 [Storable] 46 pr otectedlong maxMessageCount;47 public virtuallong MaxMessageCount {46 private long maxMessageCount; 47 public long MaxMessageCount { 48 48 get { return maxMessageCount; } 49 49 } 50 50 51 51 [StorableConstructor] 52 pr otectedLog(bool deserializing) : base(deserializing) { }53 pr otectedLog(Log original, Cloner cloner)52 private Log(bool deserializing) : base(deserializing) { } 53 private Log(Log original, Cloner cloner) 54 54 : base(original, cloner) { 55 55 this.messages = new List<string>(original.messages); … … 66 66 } 67 67 68 public v irtual void Clear() {68 public void Clear() { 69 69 messages.Clear(); 70 70 OnCleared(); 71 71 } 72 public v irtual void LogMessage(string message) {72 public void LogMessage(string message) { 73 73 string s = FormatLogMessage(message); 74 74 messages.Add(s); … … 76 76 OnMessageAdded(s); 77 77 } 78 public v irtual void LogException(Exception ex) {78 public void LogException(Exception ex) { 79 79 string s = FormatException(ex); 80 80 messages.Add(s); … … 82 82 OnMessageAdded(s); 83 83 } 84 pr otected virtualvoid CapMessages() {84 private void CapMessages() { 85 85 while (maxMessageCount >= 0 && messages.Count > maxMessageCount) { 86 86 messages.RemoveAt(0); 87 87 } 88 88 } 89 p rotected virtualstring FormatLogMessage(string message) {89 public static string FormatLogMessage(string message) { 90 90 return DateTime.Now.ToString() + "\t" + message; 91 91 } 92 p rotected virtualstring FormatException(Exception ex) {92 public static string FormatException(Exception ex) { 93 93 return DateTime.Now.ToString() + "\t" + "Exception occurred:" + Environment.NewLine + ErrorHandling.BuildErrorMessage(ex); 94 94 } 95 95 96 96 public event EventHandler<EventArgs<string>> MessageAdded; 97 pr otected virtualvoid OnMessageAdded(string message) {97 private void OnMessageAdded(string message) { 98 98 EventHandler<EventArgs<string>> handler = MessageAdded; 99 99 if (handler != null) handler(this, new EventArgs<string>(message)); 100 100 } 101 101 public event EventHandler Cleared; 102 pr otected virtualvoid OnCleared() {102 private void OnCleared() { 103 103 EventHandler handler = Cleared; 104 104 if (handler != null) handler(this, EventArgs.Empty); -
branches/gteufl/HeuristicLab.Core/3.3/NamedItem.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/OperatorExecutionException.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 21 21 22 22 using System; 23 using System.Diagnostics;23 using HeuristicLab.PluginInfrastructure; 24 24 25 25 namespace HeuristicLab.Core { … … 34 34 get { 35 35 string name = "\"" + op.Name + "\""; 36 var assembly = op.GetType().Assembly; 36 37 if (!op.Name.Equals(op.ItemName)) name += " (" + op.ItemName + ")"; 37 if (!string.IsNullOrEmpty(op.GetType().Assembly.Location)) { 38 var fvi = FileVersionInfo.GetVersionInfo(op.GetType().Assembly.Location); 39 name += " [" + fvi.FileName + ": " + fvi.FileVersion + "]"; 38 if (!string.IsNullOrEmpty(assembly.Location)) { 39 name += " [" + assembly.Location + ": " + AssemblyHelpers.GetFileVersion(assembly) + "]"; 40 40 } 41 41 if (InnerException == null) -
branches/gteufl/HeuristicLab.Core/3.3/OperatorGraph.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/ParameterizedNamedItem.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/PersistenceContentManager.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 20 20 #endregion 21 21 22 using System.IO.Compression; 22 23 using HeuristicLab.Common; 23 24 using HeuristicLab.Persistence.Default.Xml; … … 32 33 33 34 protected override void SaveContent(IStorableContent content, string filename, bool compressed) { 34 XmlGenerator.Serialize(content, filename, compressed ? 9 : 0);35 XmlGenerator.Serialize(content, filename, compressed ? CompressionLevel.Optimal : CompressionLevel.NoCompression); 35 36 } 36 37 } -
branches/gteufl/HeuristicLab.Core/3.3/Plugin.cs.frame
r10037 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 29 29 /// Plugin class for HeuristicLab.Core plugin. 30 30 /// </summary> 31 [Plugin("HeuristicLab.Core", "3.3. 9.$WCREV$")]31 [Plugin("HeuristicLab.Core", "3.3.12.$WCREV$")] 32 32 [PluginFile("HeuristicLab.Core-3.3.dll", PluginFileType.Assembly)] 33 33 [PluginDependency("HeuristicLab.Collections", "3.3")] -
branches/gteufl/HeuristicLab.Core/3.3/Properties/AssemblyInfo.cs.frame
r10037 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 32 32 [assembly: AssemblyCompany("")] 33 33 [assembly: AssemblyProduct("HeuristicLab")] 34 [assembly: AssemblyCopyright("(c) 2002-201 3HEAL")]34 [assembly: AssemblyCopyright("(c) 2002-2015 HEAL")] 35 35 [assembly: AssemblyTrademark("")] 36 36 [assembly: AssemblyCulture("")] … … 54 54 // by using the '*' as shown below: 55 55 [assembly: AssemblyVersion("3.3.0.0")] 56 [assembly: AssemblyFileVersion("3.3. 9.$WCREV$")]56 [assembly: AssemblyFileVersion("3.3.12.$WCREV$")] -
branches/gteufl/HeuristicLab.Core/3.3/Scope.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Core/3.3/ThreadSafeLog.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 21 21 22 22 using System; 23 using System.Collections.Concurrent; 23 24 using System.Collections.Generic; 24 using System.Linq;25 using System.Threading;26 25 using HeuristicLab.Common; 27 26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; … … 30 29 [Item("ThreadSafeLog", "A thread-safe log for logging string messages.")] 31 30 [StorableClass] 32 public sealed class ThreadSafeLog : Log { 33 private ReaderWriterLockSlim locker = new ReaderWriterLockSlim(); 31 public sealed class ThreadSafeLog : Item, ILog, IStorableContent { 32 public string Filename { get; set; } 33 private ConcurrentQueue<string> messages; 34 34 35 public override IEnumerable<string> Messages { 36 get { 37 locker.EnterReadLock(); 38 try { 39 return messages.ToArray(); // return copy of messages 40 } finally { locker.ExitReadLock(); } 41 } 35 public IEnumerable<string> Messages { 36 get { return messages.ToArray(); } 37 } 38 39 [Storable(Name = "messages")] 40 private IEnumerable<string> StorableMessages { 41 get { return Messages; } 42 set { messages = new ConcurrentQueue<string>(value); } 43 } 44 45 [Storable] 46 private long maxMessageCount; 47 public long MaxMessageCount { 48 get { return maxMessageCount; } 42 49 } 43 50 44 51 [StorableConstructor] 45 52 private ThreadSafeLog(bool deserializing) : base(deserializing) { } 46 public ThreadSafeLog(long maxMessageCount = -1) 47 : base(maxMessageCount) { 53 private ThreadSafeLog(ThreadSafeLog original, Cloner cloner) 54 : base(original, cloner) { 55 this.messages = new ConcurrentQueue<string>(original.messages); 56 this.maxMessageCount = original.maxMessageCount; 57 } 58 public ThreadSafeLog(long maxMessageCount = int.MaxValue) { 59 this.messages = new ConcurrentQueue<string>(); 60 this.maxMessageCount = maxMessageCount; 48 61 } 49 62 50 private ThreadSafeLog(ThreadSafeLog original, Cloner cloner)51 : base(original, cloner) { }52 53 63 public override IDeepCloneable Clone(Cloner cloner) { 54 locker.EnterReadLock(); 55 try { 56 return new ThreadSafeLog(this, cloner); 57 } finally { locker.ExitReadLock(); } 64 return new ThreadSafeLog(this, cloner); 58 65 } 59 66 60 public override void Clear() { 61 locker.EnterWriteLock(); 62 try { 63 messages.Clear(); 64 } finally { locker.ExitWriteLock(); } 67 public void Clear() { 68 messages = new ConcurrentQueue<string>(); 65 69 OnCleared(); 66 70 } 67 71 68 public override void LogMessage(string message) { 69 string s = FormatLogMessage(message); 70 locker.EnterWriteLock(); 71 try { 72 messages.Add(s); 73 CapMessages(); 74 } finally { locker.ExitWriteLock(); } 72 public void LogMessage(string message) { 73 var s = Log.FormatLogMessage(message); 74 messages.Enqueue(s); 75 CapMessages(); 75 76 OnMessageAdded(s); 76 77 } 77 78 78 public override void LogException(Exception ex) { 79 string s = FormatException(ex); 80 locker.EnterWriteLock(); 81 try { 82 messages.Add(s); 83 CapMessages(); 84 } finally { locker.ExitWriteLock(); } 79 public void LogException(Exception ex) { 80 var s = Log.FormatException(ex); 81 messages.Enqueue(s); 82 CapMessages(); 85 83 OnMessageAdded(s); 84 } 85 86 private readonly object capLock = new object(); 87 private void CapMessages() { 88 lock (capLock) { 89 string s; 90 while (messages.Count > maxMessageCount) 91 if (!messages.TryDequeue(out s)) break; 92 } 93 } 94 95 public event EventHandler<EventArgs<string>> MessageAdded; 96 private void OnMessageAdded(string message) { 97 var handler = MessageAdded; 98 if (handler != null) handler(this, new EventArgs<string>(message)); 99 } 100 101 public event EventHandler Cleared; 102 private void OnCleared() { 103 var handler = Cleared; 104 if (handler != null) handler(this, EventArgs.Empty); 86 105 } 87 106 } -
branches/gteufl/HeuristicLab.Core/3.3/Variable.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 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.