Changeset 7737 for trunk/sources/HeuristicLab.Problems.ExternalEvaluation

Timestamp:

04/17/12 16:59:39 (13 years ago)

Author:

epitzer

Message:

#1722 add missing Hits property in cloning constructor and clean up code

File:

• trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/EvaluationCache.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/EvaluationCache.cs

@@ -151 +151 @@
       : base(original, cloner) {
       SetCacheValues(original.GetCacheValues());
+      Hits = original.Hits;
       RegisterEvents();
     }
@@ -167 +168 @@
     #region Event Handling
     private void RegisterEvents() {
-      CapacityParameter.Value.ValueChanged += new EventHandler(Value_ValueChanged);
-    }
-
-    void Value_ValueChanged(object sender, EventArgs e) {
+      CapacityParameter.Value.ValueChanged += new EventHandler(CapacityChanged);
+    }
+
+    void CapacityChanged(object sender, EventArgs e) {
       if (Capacity < 0)
         throw new ArgumentOutOfRangeException("Cache capacity cannot be less than zero");
@@ -190 +191 @@
 
     public double GetValue(SolutionMessage message, Evaluator evaluate) {
-      CacheEntry entry = new CacheEntry(message.ToString());
-      LinkedListNode<CacheEntry> node;
+      var entry = new CacheEntry(message.ToString());
       bool lockTaken = false;
       bool waited = false;
@@ -197 +197 @@
         Monitor.Enter(cacheLock, ref lockTaken);
         while (true) {
+          LinkedListNode<CacheEntry> node;
           if (index.TryGetValue(entry, out node)) {
             list.Remove(node);
@@ -243 +244 @@
     private void Trim() {
       while (list.Count > Capacity) {
-        LinkedListNode<CacheEntry> item = list.First;
+        var item = list.First;
         list.Remove(item);
         index.Remove(item.Value);
@@ -260 +261 @@
         index = new Dictionary<CacheEntry, LinkedListNode<CacheEntry>>();
         foreach (var kvp in value) {
-          var entry = new CacheEntry(kvp.Key);
-          entry.Value = kvp.Value;
+          var entry = new CacheEntry(kvp.Key) { Value = kvp.Value };
           index[entry] = list.AddLast(entry);
         }