Changeset 6618 for branches/GP.Grammar.Editor/HeuristicLab.Core/3.3

Timestamp:

08/01/11 17:48:53 (13 years ago)

Author:

mkommend

Message:

#1479: Integrated trunk changes.

Location:

branches/GP.Grammar.Editor/HeuristicLab.Core/3.3

Files:

• Collections/ItemSet.cs (modified) (1 diff)
• HeuristicLab.Core-3.3.csproj (modified) (1 diff)
• HeuristicLabCorePlugin.cs.frame (modified) (1 diff)
• Log.cs (modified) (3 diffs)
• Properties/AssemblyInfo.frame (modified) (1 diff)
• ThreadSafeLog.cs (added)

branches/GP.Grammar.Editor/HeuristicLab.Core/3.3/Collections/ItemSet.cs

@@ -54 +54 @@
     public ItemSet() : base() { }
     public ItemSet(IEnumerable<T> collection) : base(collection) { }
+    public ItemSet(IEqualityComparer<T> comparer) : base(comparer) { }
+    public ItemSet(IEnumerable<T> collection, IEqualityComparer<T> comparer) : base(collection, comparer) { }
 
     public object Clone() {

branches/GP.Grammar.Editor/HeuristicLab.Core/3.3/HeuristicLab.Core-3.3.csproj

@@ -191 +191 @@
     <Compile Include="HeuristicLabCorePlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ThreadSafeLog.cs" />
     <Compile Include="Variable.cs" />
   </ItemGroup>

branches/GP.Grammar.Editor/HeuristicLab.Core/3.3/HeuristicLabCorePlugin.cs.frame

@@ -29 +29 @@
   /// Plugin class for HeuristicLab.Core plugin.
   /// </summary>
-  [Plugin("HeuristicLab.Core", "3.3.4.$WCREV$")]
+  [Plugin("HeuristicLab.Core", "3.3.5.$WCREV$")]
   [PluginFile("HeuristicLab.Core-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Collections", "3.3")]

branches/GP.Grammar.Editor/HeuristicLab.Core/3.3/Log.cs

@@ -43 +43 @@
     }
 
+    [Storable]
+    protected long maxMessageCount;
+    public virtual long MaxMessageCount {
+      get { return maxMessageCount; }
+    }
+
     [StorableConstructor]
     protected Log(bool deserializing) : base(deserializing) { }
     protected Log(Log original, Cloner cloner)
       : base(original, cloner) {
-      messages = new List<string>(original.messages);
+      this.messages = new List<string>(original.messages);
+      this.maxMessageCount = original.maxMessageCount;
     }
-    public Log()
+    public Log(long maxMessageCount = -1)
       : base() {
-      messages = new List<string>();
+      this.messages = new List<string>();
+      this.maxMessageCount = maxMessageCount;
     }
 
@@ -65 +73 @@
       string s = DateTime.Now.ToString() + "\t" + message;
       messages.Add(s);
+      CapMessages();
       OnMessageAdded(s);
     }
@@ -70 +79 @@
       string s = DateTime.Now.ToString() + "\t" + "Exception occurred:" + Environment.NewLine + ErrorHandling.BuildErrorMessage(ex);
       messages.Add(s);
+      CapMessages();
       OnMessageAdded(s);
+    }
+    protected virtual void CapMessages() {
+      while (maxMessageCount >= 0 && messages.Count > maxMessageCount) {
+        messages.RemoveAt(0);
+      }
     }
 

branches/GP.Grammar.Editor/HeuristicLab.Core/3.3/Properties/AssemblyInfo.frame

@@ -54 +54 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.4.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.5.$WCREV$")]