taskjuggler 0.0.7 → 0.0.8

data/doc/TaskJuggler/ColumnListAttribute.html

@@ -153,12 +153,18 @@
 				
 					<li><a href="../TaskJuggler/ChargeSetListAttribute.html">TaskJuggler::ChargeSetListAttribute</a></li>
 				
+					<li><a href="../TaskJuggler/CollisionDetector.html">TaskJuggler::CollisionDetector</a></li>
+				
 					<li><a href="../TaskJuggler/ColumnListAttribute.html">TaskJuggler::ColumnListAttribute</a></li>
 				
 					<li><a href="../TaskJuggler/ColumnTable.html">TaskJuggler::ColumnTable</a></li>
 				
 					<li><a href="../TaskJuggler/Daemon.html">TaskJuggler::Daemon</a></li>
 				
+					<li><a href="../TaskJuggler/DataCache.html">TaskJuggler::DataCache</a></li>
+				
+					<li><a href="../TaskJuggler/DataCacheEntry.html">TaskJuggler::DataCacheEntry</a></li>
+				
 					<li><a href="../TaskJuggler/DateAttribute.html">TaskJuggler::DateAttribute</a></li>
 				
 					<li><a href="../TaskJuggler/DefinitionListAttribute.html">TaskJuggler::DefinitionListAttribute</a></li>
@@ -265,7 +271,7 @@
 				
 					<li><a href="../TaskJuggler/NodeListAttribute.html">TaskJuggler::NodeListAttribute</a></li>
 				
-					<li><a href="../TaskJuggler/OnShiftCache.html">TaskJuggler::OnShiftCache</a></li>
+					<li><a href="../TaskJuggler/PlaceHolderCell.html">TaskJuggler::PlaceHolderCell</a></li>
 				
 					<li><a href="../TaskJuggler/ProcessIntercom.html">TaskJuggler::ProcessIntercom</a></li>
 				
@@ -445,6 +451,10 @@
 				
 					<li><a href="../TaskJuggler/TextParser/StackElement.html">TaskJuggler::TextParser::StackElement</a></li>
 				
+					<li><a href="../TaskJuggler/TextParser/State.html">TaskJuggler::TextParser::State</a></li>
+				
+					<li><a href="../TaskJuggler/TextParser/StateTransition.html">TaskJuggler::TextParser::StateTransition</a></li>
+				
 					<li><a href="../TaskJuggler/TextParser/TextParserResultArray.html">TaskJuggler::TextParser::TextParserResultArray</a></li>
 				
 					<li><a href="../TaskJuggler/TextParser/TokenDoc.html">TaskJuggler::TextParser::TokenDoc</a></li>

data/doc/TaskJuggler/ColumnTable.html

@@ -151,12 +151,18 @@
 				
 					<li><a href="../TaskJuggler/ChargeSetListAttribute.html">TaskJuggler::ChargeSetListAttribute</a></li>
 				
+					<li><a href="../TaskJuggler/CollisionDetector.html">TaskJuggler::CollisionDetector</a></li>
+				
 					<li><a href="../TaskJuggler/ColumnListAttribute.html">TaskJuggler::ColumnListAttribute</a></li>
 				
 					<li><a href="../TaskJuggler/ColumnTable.html">TaskJuggler::ColumnTable</a></li>
 				
 					<li><a href="../TaskJuggler/Daemon.html">TaskJuggler::Daemon</a></li>
 				
+					<li><a href="../TaskJuggler/DataCache.html">TaskJuggler::DataCache</a></li>
+				
+					<li><a href="../TaskJuggler/DataCacheEntry.html">TaskJuggler::DataCacheEntry</a></li>
+				
 					<li><a href="../TaskJuggler/DateAttribute.html">TaskJuggler::DateAttribute</a></li>
 				
 					<li><a href="../TaskJuggler/DefinitionListAttribute.html">TaskJuggler::DefinitionListAttribute</a></li>
@@ -263,7 +269,7 @@
 				
 					<li><a href="../TaskJuggler/NodeListAttribute.html">TaskJuggler::NodeListAttribute</a></li>
 				
-					<li><a href="../TaskJuggler/OnShiftCache.html">TaskJuggler::OnShiftCache</a></li>
+					<li><a href="../TaskJuggler/PlaceHolderCell.html">TaskJuggler::PlaceHolderCell</a></li>
 				
 					<li><a href="../TaskJuggler/ProcessIntercom.html">TaskJuggler::ProcessIntercom</a></li>
 				
@@ -443,6 +449,10 @@
 				
 					<li><a href="../TaskJuggler/TextParser/StackElement.html">TaskJuggler::TextParser::StackElement</a></li>
 				
+					<li><a href="../TaskJuggler/TextParser/State.html">TaskJuggler::TextParser::State</a></li>
+				
+					<li><a href="../TaskJuggler/TextParser/StateTransition.html">TaskJuggler::TextParser::StateTransition</a></li>
+				
 					<li><a href="../TaskJuggler/TextParser/TextParserResultArray.html">TaskJuggler::TextParser::TextParserResultArray</a></li>
 				
 					<li><a href="../TaskJuggler/TextParser/TokenDoc.html">TaskJuggler::TextParser::TokenDoc</a></li>

data/doc/TaskJuggler/Daemon.html

@@ -153,12 +153,18 @@
 				
 					<li><a href="../TaskJuggler/ChargeSetListAttribute.html">TaskJuggler::ChargeSetListAttribute</a></li>
 				
+					<li><a href="../TaskJuggler/CollisionDetector.html">TaskJuggler::CollisionDetector</a></li>
+				
 					<li><a href="../TaskJuggler/ColumnListAttribute.html">TaskJuggler::ColumnListAttribute</a></li>
 				
 					<li><a href="../TaskJuggler/ColumnTable.html">TaskJuggler::ColumnTable</a></li>
 				
 					<li><a href="../TaskJuggler/Daemon.html">TaskJuggler::Daemon</a></li>
 				
+					<li><a href="../TaskJuggler/DataCache.html">TaskJuggler::DataCache</a></li>
+				
+					<li><a href="../TaskJuggler/DataCacheEntry.html">TaskJuggler::DataCacheEntry</a></li>
+				
 					<li><a href="../TaskJuggler/DateAttribute.html">TaskJuggler::DateAttribute</a></li>
 				
 					<li><a href="../TaskJuggler/DefinitionListAttribute.html">TaskJuggler::DefinitionListAttribute</a></li>
@@ -265,7 +271,7 @@
 				
 					<li><a href="../TaskJuggler/NodeListAttribute.html">TaskJuggler::NodeListAttribute</a></li>
 				
-					<li><a href="../TaskJuggler/OnShiftCache.html">TaskJuggler::OnShiftCache</a></li>
+					<li><a href="../TaskJuggler/PlaceHolderCell.html">TaskJuggler::PlaceHolderCell</a></li>
 				
 					<li><a href="../TaskJuggler/ProcessIntercom.html">TaskJuggler::ProcessIntercom</a></li>
 				
@@ -445,6 +451,10 @@
 				
 					<li><a href="../TaskJuggler/TextParser/StackElement.html">TaskJuggler::TextParser::StackElement</a></li>
 				
+					<li><a href="../TaskJuggler/TextParser/State.html">TaskJuggler::TextParser::State</a></li>
+				
+					<li><a href="../TaskJuggler/TextParser/StateTransition.html">TaskJuggler::TextParser::StateTransition</a></li>
+				
 					<li><a href="../TaskJuggler/TextParser/TextParserResultArray.html">TaskJuggler::TextParser::TextParserResultArray</a></li>
 				
 					<li><a href="../TaskJuggler/TextParser/TokenDoc.html">TaskJuggler::TextParser::TokenDoc</a></li>

data/doc/TaskJuggler/{OnShiftCache.html → DataCache.html}

@@ -5,7 +5,7 @@
 <head>
 	<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
 
-	<title>Class: TaskJuggler::OnShiftCache</title>
+	<title>Class: TaskJuggler::DataCache</title>
 
 	<link rel="stylesheet" href="../rdoc.css" type="text/css" media="screen" />
 
@@ -38,8 +38,8 @@
 				<div class="section-body">
 					<ul>
 					
-						<li><a href="../lib/WorkingHours_rb.html?TB_iframe=true&amp;height=550&amp;width=785"
-							class="thickbox" title="lib/WorkingHours.rb">lib/WorkingHours.rb</a></li>
+						<li><a href="../lib/DataCache_rb.html?TB_iframe=true&amp;height=550&amp;width=785"
+							class="thickbox" title="lib/DataCache.rb">lib/DataCache.rb</a></li>
 					
 					</ul>
 				</div>
@@ -71,15 +71,15 @@
 					
 					<li><a href="#method-c-new">::new</a></li>
 					
-					<li><a href="#method-i-dateToIndex">#dateToIndex</a></li>
+					<li><a href="#method-i-flush">#flush</a></li>
 					
-					<li><a href="#method-i-get">#get</a></li>
+					<li><a href="#method-i-load">#load</a></li>
 					
-					<li><a href="#method-i-register">#register</a></li>
+					<li><a href="#method-i-resize">#resize</a></li>
 					
-					<li><a href="#method-i-resetCaches">#resetCaches</a></li>
+					<li><a href="#method-i-store">#store</a></li>
 					
-					<li><a href="#method-i-set">#set</a></li>
+					<li><a href="#method-i-to_s">#to_s</a></li>
 					
 				</ul>
 			</div>
@@ -87,6 +87,17 @@
 
 			<!-- Included Modules -->
 			
+			<div id="includes-section" class="section">
+				<h3 class="section-header">Included Modules</h3>
+				<ul class="link-list">
+				
+				
+					<li><span class="include">Singleton</span></li>
+				
+				
+				</ul>
+			</div>
+			
 		</div>
 
 		<div id="project-metadata">
@@ -159,12 +170,18 @@
 				
 					<li><a href="../TaskJuggler/ChargeSetListAttribute.html">TaskJuggler::ChargeSetListAttribute</a></li>
 				
+					<li><a href="../TaskJuggler/CollisionDetector.html">TaskJuggler::CollisionDetector</a></li>
+				
 					<li><a href="../TaskJuggler/ColumnListAttribute.html">TaskJuggler::ColumnListAttribute</a></li>
 				
 					<li><a href="../TaskJuggler/ColumnTable.html">TaskJuggler::ColumnTable</a></li>
 				
 					<li><a href="../TaskJuggler/Daemon.html">TaskJuggler::Daemon</a></li>
 				
+					<li><a href="../TaskJuggler/DataCache.html">TaskJuggler::DataCache</a></li>
+				
+					<li><a href="../TaskJuggler/DataCacheEntry.html">TaskJuggler::DataCacheEntry</a></li>
+				
 					<li><a href="../TaskJuggler/DateAttribute.html">TaskJuggler::DateAttribute</a></li>
 				
 					<li><a href="../TaskJuggler/DefinitionListAttribute.html">TaskJuggler::DefinitionListAttribute</a></li>
@@ -271,7 +288,7 @@
 				
 					<li><a href="../TaskJuggler/NodeListAttribute.html">TaskJuggler::NodeListAttribute</a></li>
 				
-					<li><a href="../TaskJuggler/OnShiftCache.html">TaskJuggler::OnShiftCache</a></li>
+					<li><a href="../TaskJuggler/PlaceHolderCell.html">TaskJuggler::PlaceHolderCell</a></li>
 				
 					<li><a href="../TaskJuggler/ProcessIntercom.html">TaskJuggler::ProcessIntercom</a></li>
 				
@@ -451,6 +468,10 @@
 				
 					<li><a href="../TaskJuggler/TextParser/StackElement.html">TaskJuggler::TextParser::StackElement</a></li>
 				
+					<li><a href="../TaskJuggler/TextParser/State.html">TaskJuggler::TextParser::State</a></li>
+				
+					<li><a href="../TaskJuggler/TextParser/StateTransition.html">TaskJuggler::TextParser::StateTransition</a></li>
+				
 					<li><a href="../TaskJuggler/TextParser/TextParserResultArray.html">TaskJuggler::TextParser::TextParserResultArray</a></li>
 				
 					<li><a href="../TaskJuggler/TextParser/TokenDoc.html">TaskJuggler::TextParser::TokenDoc</a></li>
@@ -554,18 +575,16 @@
 	</div>
 
 	<div id="documentation">
-		<h1 class="class">TaskJuggler::OnShiftCache</h1>
+		<h1 class="class">TaskJuggler::DataCache</h1>
 
 		<div id="description">
 			<p>
-This cache class is used to speedup accesses to the frequently used
-WorkingHours::onShift? function. It saves the result the first time the
-function is called for a particular date and working hour set and returns
-it on subsequent calls again. Each partucular set of working hours needs
-its separate cache. The <a href="OnShiftCache.html">OnShiftCache</a> object
-is shared amongst all <a href="WorkingHours.html">WorkingHours</a> objects
-so that <a href="WorkingHours.html">WorkingHours</a> objects with identical
-working hours can share the cache.
+This class provides a global data cache that can be used to store and
+retrieve values indexed by a key. The cache is size limited. When maximum
+capacity is reached, a certain percentage of the least requested values is
+dropped from the cache. The primary purpose of this global cache is to
+store values that are expensive to compute but may be need on several
+occasions during the program execution.
 </p>
 
 		</div>
@@ -595,28 +614,24 @@ working hours can share the cache.
 
 				<div class="method-description">
 					
-					<p>
-Create the <a href="OnShiftCache.html">OnShiftCache</a> object. There
-should be only one for the application.
-</p>
+					
 					
 
 					
 					<div class="method-source-code"
 						id="new-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/WorkingHours.rb, line 28</span>
-28:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>
-29:       <span class="ruby-ivar">@caches</span> = []
-30:       <span class="ruby-ivar">@workingHoursTable</span> = []
-31:       <span class="ruby-comment cmt"># The cache is an array with entries for each date. To minimize the</span>
-32:       <span class="ruby-comment cmt"># necessary storage space, we need to guess the smallest used date</span>
-33:       <span class="ruby-comment cmt"># (which gets index 0 then) and the smallest distance between dates.</span>
-34:       <span class="ruby-ivar">@minDate</span> = <span class="ruby-keyword kw">nil</span>
-35:       <span class="ruby-comment cmt"># We assume a timing resolution of 1 hour (the TaskJuggler default)</span>
-36:       <span class="ruby-comment cmt"># first.</span>
-37:       <span class="ruby-ivar">@minDateDelta</span> = <span class="ruby-value">60</span> * <span class="ruby-value">60</span>
-38:     <span class="ruby-keyword kw">end</span></pre>
+    <span class="ruby-comment cmt"># File lib/DataCache.rb, line 53</span>
+53:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>
+54:       <span class="ruby-identifier">resize</span>
+55:       <span class="ruby-identifier">flush</span>
+56:       <span class="ruby-comment cmt"># Counter for the number of writes to the cache.</span>
+57:       <span class="ruby-ivar">@stores</span> = <span class="ruby-value">0</span>
+58:       <span class="ruby-comment cmt"># Counter for the number of found values.</span>
+59:       <span class="ruby-ivar">@hits</span> = <span class="ruby-value">0</span>
+60:       <span class="ruby-comment cmt"># Counter for the number of not found values.</span>
+61:       <span class="ruby-ivar">@misses</span> = <span class="ruby-value">0</span>
+62:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -633,13 +648,13 @@ should be only one for the application.
 			<h3 class="section-header">Public Instance Methods</h3>
 
 		
-			<div id="get-method" class="method-detail ">
-				<a name="method-i-get"></a>
+			<div id="flush-method" class="method-detail ">
+				<a name="method-i-flush"></a>
 
 				<div class="method-heading">
 				
-					<span class="method-name">get</span><span
-						class="method-args">(cache, date)</span>
+					<span class="method-name">flush</span><span
+						class="method-args">()</span>
 					<span class="method-click-advice">click to toggle source</span>
 				
 				</div>
@@ -647,18 +662,19 @@ should be only one for the application.
 				<div class="method-description">
 					
 					<p>
-Get the value for a given <tt>cache</tt> and <tt>date</tt>.
+Completely flush the cache. The statistic counters will remain intact, but
+all data values are lost.
 </p>
 					
 
 					
 					<div class="method-source-code"
-						id="get-source">
+						id="flush-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/WorkingHours.rb, line 66</span>
-66:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">get</span>(<span class="ruby-identifier">cache</span>, <span class="ruby-identifier">date</span>)
-67:       <span class="ruby-identifier">cache</span>[<span class="ruby-identifier">dateToIndex</span>(<span class="ruby-identifier">date</span>)]
-68:     <span class="ruby-keyword kw">end</span></pre>
+    <span class="ruby-comment cmt"># File lib/DataCache.rb, line 75</span>
+75:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">flush</span>
+76:       <span class="ruby-ivar">@entries</span> = {}
+77:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -669,13 +685,13 @@ Get the value for a given <tt>cache</tt> and <tt>date</tt>.
 			</div>
 
 		
-			<div id="register-method" class="method-detail ">
-				<a name="method-i-register"></a>
+			<div id="load-method" class="method-detail ">
+				<a name="method-i-load"></a>
 
 				<div class="method-heading">
 				
-					<span class="method-name">register</span><span
-						class="method-args">(wh)</span>
+					<span class="method-name">load</span><span
+						class="method-args">(key)</span>
 					<span class="method-click-advice">click to toggle source</span>
 				
 				</div>
@@ -683,34 +699,25 @@ Get the value for a given <tt>cache</tt> and <tt>date</tt>.
 				<div class="method-description">
 					
 					<p>
-Register the <a href="WorkingHours.html">WorkingHours</a> object with the
-caches. The function will return the actual cache used for this particular
-set of working hours. The <a href="WorkingHours.html">WorkingHours</a>
-object may not change its working hours after this call. The returned cache
-reference is used as a handle for subsequent OnShiftCache::set and
-OnShiftCache::get calls.
+Retrieve the value indexed by <em>key</em> from the cache. If it&#8217;s
+not found, nil is returned.
 </p>
 					
 
 					
 					<div class="method-source-code"
-						id="register-source">
+						id="load-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/WorkingHours.rb, line 45</span>
-45:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">register</span>(<span class="ruby-identifier">wh</span>)
-46:       <span class="ruby-comment cmt"># Search the list of already registered caches for an identical set of</span>
-47:       <span class="ruby-comment cmt"># WorkingHours. In case one is found, return the reference to this</span>
-48:       <span class="ruby-comment cmt"># cache.</span>
-49:       <span class="ruby-ivar">@workingHoursTable</span>.<span class="ruby-identifier">length</span>.<span class="ruby-identifier">times</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">i</span><span class="ruby-operator">|</span>
-50:         <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@workingHoursTable</span>[<span class="ruby-identifier">i</span>] <span class="ruby-operator">==</span> <span class="ruby-identifier">wh</span>
-51:           <span class="ruby-keyword kw">return</span> <span class="ruby-ivar">@caches</span>[<span class="ruby-identifier">i</span>]
-52:         <span class="ruby-keyword kw">end</span>
-53:       <span class="ruby-keyword kw">end</span>
-54:       <span class="ruby-comment cmt"># If this is a new set of WorkingHours we create a new cache for it.</span>
-55:       <span class="ruby-ivar">@workingHoursTable</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-constant">WorkingHours</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">wh</span>)
-56:       <span class="ruby-ivar">@caches</span> <span class="ruby-operator">&lt;&lt;</span> []
-57:       <span class="ruby-ivar">@caches</span>.<span class="ruby-identifier">last</span>
-58:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/DataCache.rb, line 103</span>
+103:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">load</span>(<span class="ruby-identifier">key</span>)
+104:       <span class="ruby-keyword kw">if</span> (<span class="ruby-identifier">e</span> = <span class="ruby-ivar">@entries</span>[<span class="ruby-identifier">key</span>])
+105:         <span class="ruby-ivar">@hits</span> <span class="ruby-operator">+=</span> <span class="ruby-value">1</span>
+106:         <span class="ruby-identifier">e</span>.<span class="ruby-identifier">value</span>
+107:       <span class="ruby-keyword kw">else</span>
+108:         <span class="ruby-ivar">@misses</span> <span class="ruby-operator">+=</span> <span class="ruby-value">1</span>
+109:         <span class="ruby-keyword kw">nil</span>
+110:       <span class="ruby-keyword kw">end</span>
+111:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -721,13 +728,13 @@ OnShiftCache::get calls.
 			</div>
 
 		
-			<div id="set-method" class="method-detail ">
-				<a name="method-i-set"></a>
+			<div id="resize-method" class="method-detail ">
+				<a name="method-i-resize"></a>
 
 				<div class="method-heading">
 				
-					<span class="method-name">set</span><span
-						class="method-args">(cache, date, value)</span>
+					<span class="method-name">resize</span><span
+						class="method-args">(size = 100000)</span>
 					<span class="method-click-advice">click to toggle source</span>
 				
 				</div>
@@ -735,18 +742,22 @@ OnShiftCache::get calls.
 				<div class="method-description">
 					
 					<p>
-Set the <tt>value</tt> for a given <tt>cache</tt> and <tt>date</tt>.
+For now, we use this randomly determined size.
 </p>
 					
 
 					
 					<div class="method-source-code"
-						id="set-source">
+						id="resize-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/WorkingHours.rb, line 61</span>
-61:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">set</span>(<span class="ruby-identifier">cache</span>, <span class="ruby-identifier">date</span>, <span class="ruby-identifier">value</span>)
-62:       <span class="ruby-identifier">cache</span>[<span class="ruby-identifier">dateToIndex</span>(<span class="ruby-identifier">date</span>)] = <span class="ruby-identifier">value</span>
-63:     <span class="ruby-keyword kw">end</span></pre>
+    <span class="ruby-comment cmt"># File lib/DataCache.rb, line 65</span>
+65:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">resize</span>(<span class="ruby-identifier">size</span> = <span class="ruby-value">100000</span>)
+66:       <span class="ruby-ivar">@highWaterMark</span> = <span class="ruby-identifier">size</span>
+67:       <span class="ruby-comment cmt"># Flushing out the least used entries is fairly expensive. So we only</span>
+68:       <span class="ruby-comment cmt"># want to do this once in a while. The lowWaterMark determines how much</span>
+69:       <span class="ruby-comment cmt"># of the entries will survive the flush.</span>
+70:       <span class="ruby-ivar">@lowWaterMark</span> = <span class="ruby-identifier">size</span> * <span class="ruby-value">0.9</span>
+71:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -757,19 +768,13 @@ Set the <tt>value</tt> for a given <tt>cache</tt> and <tt>date</tt>.
 			</div>
 
 		
-		</div>
-	
-		<div id="private-instance-method-details" class="method-section section">
-			<h3 class="section-header">Private Instance Methods</h3>
-
-		
-			<div id="date-o-ndex-method" class="method-detail ">
-				<a name="method-i-dateToIndex"></a>
+			<div id="store-method" class="method-detail ">
+				<a name="method-i-store"></a>
 
 				<div class="method-heading">
 				
-					<span class="method-name">dateToIndex</span><span
-						class="method-args">(date)</span>
+					<span class="method-name">store</span><span
+						class="method-args">(value, key)</span>
 					<span class="method-click-advice">click to toggle source</span>
 				
 				</div>
@@ -777,49 +782,35 @@ Set the <tt>value</tt> for a given <tt>cache</tt> and <tt>date</tt>.
 				<div class="method-description">
 					
 					<p>
-Convert a <a href="TjTime.html">TjTime</a> <tt>date</tt> to an index in the
-cache Array. To optimize the size of the cache, we have to guess the
-smallest used date and the regular distance between the date values. If we
-have to correct these guessed values, we have to clear the caches.
+Store <em>value</em> into the cache using <em>key</em> to tag it.
+<em>key</em> must be unique and must be used to load the value from the
+cache again. You cannot store nil values!
 </p>
 					
 
 					
 					<div class="method-source-code"
-						id="date-o-ndex-source">
+						id="store-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/WorkingHours.rb, line 82</span>
- 82:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">dateToIndex</span>(<span class="ruby-identifier">date</span>)
- 83:       <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@minDate</span>.<span class="ruby-identifier">nil?</span> <span class="ruby-operator">||</span> <span class="ruby-identifier">date</span> <span class="ruby-operator">&lt;</span> <span class="ruby-ivar">@minDate</span>
- 84:         <span class="ruby-ivar">@minDate</span> = <span class="ruby-identifier">date</span>
- 85:         <span class="ruby-identifier">resetCaches</span>
- 86:       <span class="ruby-keyword kw">end</span>
- 87:       <span class="ruby-identifier">startDate</span> = <span class="ruby-identifier">date</span> <span class="ruby-operator">-</span> <span class="ruby-ivar">@minDate</span>
- 88:       <span class="ruby-identifier">div</span>, <span class="ruby-identifier">mod</span> = <span class="ruby-identifier">startDate</span>.<span class="ruby-identifier">divmod</span>(<span class="ruby-ivar">@minDateDelta</span>)
- 89:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">mod</span> <span class="ruby-operator">!=</span> <span class="ruby-value">0</span>
- 90:         <span class="ruby-identifier">resetCaches</span>
- 91:         <span class="ruby-comment cmt"># We have to guess the timingresolution of the project here. Possible</span>
- 92:         <span class="ruby-comment cmt"># values are 5, 10, 15, 20, 30 or 60 minutes.</span>
- 93:         <span class="ruby-keyword kw">case</span> <span class="ruby-ivar">@minDateDelta</span> <span class="ruby-operator">/</span> <span class="ruby-value">60</span>
- 94:         <span class="ruby-keyword kw">when</span> <span class="ruby-value">60</span>
- 95:           <span class="ruby-ivar">@minDateDelta</span> = <span class="ruby-value">30</span>
- 96:         <span class="ruby-keyword kw">when</span> <span class="ruby-value">30</span>
- 97:           <span class="ruby-ivar">@minDateDelta</span> = <span class="ruby-value">20</span>
- 98:         <span class="ruby-keyword kw">when</span> <span class="ruby-value">20</span>
- 99:           <span class="ruby-ivar">@minDateDelta</span> = <span class="ruby-value">15</span>
-100:         <span class="ruby-keyword kw">when</span> <span class="ruby-value">15</span>
-101:           <span class="ruby-ivar">@minDateDelta</span> = <span class="ruby-value">10</span>
-102:         <span class="ruby-keyword kw">when</span> <span class="ruby-value">10</span>
-103:           <span class="ruby-ivar">@minDateDelta</span> = <span class="ruby-value">5</span>
-104:         <span class="ruby-keyword kw">else</span>
-105:           <span class="ruby-identifier">raise</span> <span class="ruby-value str">&quot;Illegal timing resolution!&quot;</span>
-106:         <span class="ruby-keyword kw">end</span>
-107:         <span class="ruby-ivar">@minDateDelta</span> <span class="ruby-operator">*=</span> <span class="ruby-value">60</span>
-108:         <span class="ruby-identifier">div</span> = <span class="ruby-identifier">startDate</span> <span class="ruby-operator">/</span> <span class="ruby-ivar">@minDateDelta</span>
-109:       <span class="ruby-keyword kw">end</span>
-110: 
-111:       <span class="ruby-identifier">div</span>
-112:     <span class="ruby-keyword kw">end</span></pre>
+    <span class="ruby-comment cmt"># File lib/DataCache.rb, line 82</span>
+82:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store</span>(<span class="ruby-identifier">value</span>, <span class="ruby-identifier">key</span>)
+83:       <span class="ruby-ivar">@stores</span> <span class="ruby-operator">+=</span> <span class="ruby-value">1</span>
+84: 
+85:       <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@entries</span>.<span class="ruby-identifier">size</span> <span class="ruby-operator">&gt;</span> <span class="ruby-ivar">@highWaterMark</span>
+86:         <span class="ruby-keyword kw">while</span> <span class="ruby-ivar">@entries</span>.<span class="ruby-identifier">size</span> <span class="ruby-operator">&gt;</span> <span class="ruby-ivar">@lowWaterMark</span>
+87:           <span class="ruby-comment cmt"># How many entries do we need to delete to get to the low watermark?</span>
+88:           <span class="ruby-identifier">toDelete</span> = <span class="ruby-ivar">@entries</span>.<span class="ruby-identifier">size</span> <span class="ruby-operator">-</span> <span class="ruby-ivar">@lowWaterMark</span>
+89:           <span class="ruby-ivar">@entries</span>.<span class="ruby-identifier">delete_if</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">foo</span>, <span class="ruby-identifier">e</span><span class="ruby-operator">|</span>
+90:             <span class="ruby-comment cmt"># Hit counts age with every cleanup.</span>
+91:             (<span class="ruby-identifier">e</span>.<span class="ruby-identifier">hits</span> <span class="ruby-operator">-=</span> <span class="ruby-value">1</span>) <span class="ruby-operator">&lt;</span> <span class="ruby-value">0</span> <span class="ruby-operator">&amp;&amp;</span> (<span class="ruby-identifier">toDelete</span> <span class="ruby-operator">-=</span> <span class="ruby-value">1</span>) <span class="ruby-operator">&gt;=</span> <span class="ruby-value">0</span>
+92:           <span class="ruby-keyword kw">end</span>
+93:         <span class="ruby-keyword kw">end</span>
+94:       <span class="ruby-keyword kw">end</span>
+95: 
+96:       <span class="ruby-ivar">@entries</span>[<span class="ruby-identifier">key</span>] = <span class="ruby-constant">DataCacheEntry</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">value</span>)
+97: 
+98:       <span class="ruby-identifier">value</span>
+99:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>
@@ -830,12 +821,12 @@ have to correct these guessed values, we have to clear the caches.
 			</div>
 
 		
-			<div id="reset-aches-method" class="method-detail ">
-				<a name="method-i-resetCaches"></a>
+			<div id="to-s-method" class="method-detail ">
+				<a name="method-i-to_s"></a>
 
 				<div class="method-heading">
 				
-					<span class="method-name">resetCaches</span><span
+					<span class="method-name">to_s</span><span
 						class="method-args">()</span>
 					<span class="method-click-advice">click to toggle source</span>
 				
@@ -843,20 +834,17 @@ have to correct these guessed values, we have to clear the caches.
 
 				<div class="method-description">
 					
-					<p>
-When the @minDate or @minDateDelta values need to be changed, we have to
-clear all the caches again.
-</p>
+					
 					
 
 					
 					<div class="method-source-code"
-						id="reset-aches-source">
+						id="to-s-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/WorkingHours.rb, line 74</span>
-74:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">resetCaches</span>
-75:       <span class="ruby-ivar">@caches</span>.<span class="ruby-identifier">each</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">c</span><span class="ruby-operator">|</span> <span class="ruby-identifier">c</span>.<span class="ruby-identifier">clear</span> }
-76:     <span class="ruby-keyword kw">end</span></pre>
+     <span class="ruby-comment cmt"># File lib/DataCache.rb, line 113</span>
+113:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_s</span>
+114:       <span class="ruby-value str">Entries: #{@entries.size}   Stores: #{@stores}Hits: #{@hits}   Misses: #{@misses}Hit Rate: #{@hits * 100.0 / (@hits + @misses)}%</span>
+115:     <span class="ruby-keyword kw">end</span></pre>
 					</div>
 					
 				</div>