taskjuggler 0.0.3 → 0.0.4

data/doc/classes/TaskJuggler/AttributeDefinition.html

@@ -109,7 +109,7 @@ node.
 
       <div class="name-list">
 
-        <a href="#M000767">new</a>&nbsp;&nbsp;
+        <a href="#M000580">new</a>&nbsp;&nbsp;
 
       </div>
     </div>
@@ -204,12 +204,12 @@ node.
       <h3 class="section-bar">Public Class methods</h3>
 
 
-      <div id="method-M000767" class="method-detail">
-        <a name="M000767"></a>
+      <div id="method-M000580" class="method-detail">
+        <a name="M000580"></a>
 
         <div class="method-heading">
 
-          <a href="#M000767" class="method-signature">
+          <a href="#M000580" class="method-signature">
 
           <span class="method-name">new</span><span class="method-args">(id, name, objClass, inheritedFromParent, inheritedFromProject, scenarioSpecific, default, userDefined = false)</span>
 
@@ -236,8 +236,8 @@ the default value that is set upon creation of the attribute.
 </p>
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000767-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000767-source">
+            onclick="toggleCode('M000580-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000580-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/AttributeDefinition.rb, line 35</span>
 35:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">id</span>, <span class="ruby-identifier">name</span>, <span class="ruby-identifier">objClass</span>, <span class="ruby-identifier">inheritedFromParent</span>, <span class="ruby-identifier">inheritedFromProject</span>,

data/doc/classes/TaskJuggler/BatchProcessor.html

@@ -95,9 +95,9 @@ code can be submitted to be executed in parallel. The number of CPU cores
 to use is limited at object creation time. The submitted jobs will be
 queued and scheduled to the given number of CPUs. The usage model is
 simple. Create an <a href="BatchProcessor.html">BatchProcessor</a> object.
-use <a href="BatchProcessor.html#M000339">BatchProcessor#queue</a> to
+Use <a href="BatchProcessor.html#M000976">BatchProcessor#queue</a> to
 submit all the jobs and then use <a
-href="BatchProcessor.html#M000340">BatchProcessor#wait</a> to wait for
+href="BatchProcessor.html#M000977">BatchProcessor#wait</a> to wait for
 completion and to process the results.
 </p>
 
@@ -111,11 +111,11 @@ completion and to process the results.
 
       <div class="name-list">
 
-        <a href="#M000338">new</a>&nbsp;&nbsp;
+        <a href="#M000975">new</a>&nbsp;&nbsp;
 
-        <a href="#M000339">queue</a>&nbsp;&nbsp;
+        <a href="#M000976">queue</a>&nbsp;&nbsp;
 
-        <a href="#M000340">wait</a>&nbsp;&nbsp;
+        <a href="#M000977">wait</a>&nbsp;&nbsp;
 
       </div>
     </div>
@@ -136,12 +136,12 @@ completion and to process the results.
       <h3 class="section-bar">Public Class methods</h3>
 
 
-      <div id="method-M000338" class="method-detail">
-        <a name="M000338"></a>
+      <div id="method-M000975" class="method-detail">
+        <a name="M000975"></a>
 
         <div class="method-heading">
 
-          <a href="#M000338" class="method-signature">
+          <a href="#M000975" class="method-signature">
 
           <span class="method-name">new</span><span class="method-args">(maxCpuCores)</span>
 
@@ -157,41 +157,45 @@ Create a <a href="BatchProcessor.html">BatchProcessor</a> object.
 </p>
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000338-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000338-source">
+            onclick="toggleCode('M000975-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000975-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/BatchProcessor.rb, line 59</span>
-59:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">maxCpuCores</span>)
-60:       <span class="ruby-ivar">@maxCpuCores</span> = <span class="ruby-identifier">maxCpuCores</span>
-61:       <span class="ruby-comment cmt"># The job queue.</span>
-62:       <span class="ruby-ivar">@queue</span> = <span class="ruby-constant">Queue</span>.<span class="ruby-identifier">new</span>
-63:       <span class="ruby-comment cmt"># A semaphore to guard accesses to shared data structures.`</span>
-64:       <span class="ruby-ivar">@lock</span> = <span class="ruby-constant">Monitor</span>.<span class="ruby-identifier">new</span>
-65:       <span class="ruby-comment cmt"># A hash that maps process ids to JobInfo objects.</span>
-66:       <span class="ruby-ivar">@jobs</span> = { }
-67:       <span class="ruby-comment cmt"># Counts the number of pending processes.</span>
-68:       <span class="ruby-ivar">@pendingJobs</span> = <span class="ruby-value">0</span>
-69:       <span class="ruby-comment cmt"># An Array that holds all the IO objects to receive data from.</span>
-70:       <span class="ruby-ivar">@pipes</span> = []
-71:       <span class="ruby-comment cmt"># A hash that maps IO objects to JobInfo objects</span>
-72:       <span class="ruby-ivar">@pipeToJob</span> = {}
-73:       <span class="ruby-comment cmt"># This global flag is set to true to signal the threads to terminate.</span>
-74:       <span class="ruby-ivar">@terminate</span> = <span class="ruby-keyword kw">false</span>
-75:       <span class="ruby-comment cmt"># Sleep time of the threads when no data is pending.</span>
-76:       <span class="ruby-ivar">@timeout</span> = <span class="ruby-value">0</span><span class="ruby-value">.05</span>
-77: 
-78:       <span class="ruby-constant">Thread</span>.<span class="ruby-identifier">abort_on_exception</span> = <span class="ruby-keyword kw">true</span>
-79:       <span class="ruby-comment cmt"># The JobInfo objects in the @queue are processed by the pusher thread.</span>
-80:       <span class="ruby-comment cmt"># It forkes off processes to execute the code block associated with the</span>
-81:       <span class="ruby-comment cmt"># JobInfo.</span>
-82:       <span class="ruby-ivar">@pusher</span> = <span class="ruby-constant">Thread</span>.<span class="ruby-identifier">new</span> { <span class="ruby-identifier">pusher</span> }
-83:       <span class="ruby-comment cmt"># The popper thread waits for terminated childs and picks up the</span>
-84:       <span class="ruby-comment cmt"># results.</span>
-85:       <span class="ruby-ivar">@popper</span> = <span class="ruby-constant">Thread</span>.<span class="ruby-identifier">new</span> { <span class="ruby-identifier">popper</span> }
-86:       <span class="ruby-comment cmt"># The grabber thread collects $stdout and $stderr data from each child</span>
-87:       <span class="ruby-comment cmt"># process and stores them in the corresponding JobInfo.</span>
-88:       <span class="ruby-ivar">@grabber</span> = <span class="ruby-constant">Thread</span>.<span class="ruby-identifier">new</span> { <span class="ruby-identifier">grabber</span> }
-89:     <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/BatchProcessor.rb, line 68</span>
+ 68:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">maxCpuCores</span>)
+ 69:       <span class="ruby-ivar">@maxCpuCores</span> = <span class="ruby-identifier">maxCpuCores</span>
+ 70:       <span class="ruby-comment cmt"># Jobs submitted by calling queue() are put in the @toRunQueue. The</span>
+ 71:       <span class="ruby-comment cmt"># pusher Thread will pick them up and fork them off into another</span>
+ 72:       <span class="ruby-comment cmt"># process.</span>
+ 73:       <span class="ruby-ivar">@toRunQueue</span> = <span class="ruby-constant">Queue</span>.<span class="ruby-identifier">new</span>
+ 74:       <span class="ruby-comment cmt"># A hash that maps the JobInfo objects of running jobs by their PID.</span>
+ 75:       <span class="ruby-ivar">@runningJobs</span> = { }
+ 76:       <span class="ruby-comment cmt"># A list of jobs that wait to complete their writing.</span>
+ 77:       <span class="ruby-ivar">@spoolingJobs</span> = [ ]
+ 78:       <span class="ruby-comment cmt"># The wait() method will then clean the @toDropQueue, executes the post</span>
+ 79:       <span class="ruby-comment cmt"># processing block and removes all JobInfo related objects.</span>
+ 80:       <span class="ruby-ivar">@toDropQueue</span> = <span class="ruby-constant">Queue</span>.<span class="ruby-identifier">new</span>
+ 81: 
+ 82:       <span class="ruby-comment cmt"># A semaphore to guard accesses to @runningJobs, @spoolingJobs and</span>
+ 83:       <span class="ruby-comment cmt"># following shared data structures.</span>
+ 84:       <span class="ruby-ivar">@lock</span> = <span class="ruby-constant">Monitor</span>.<span class="ruby-identifier">new</span>
+ 85:       <span class="ruby-comment cmt"># We count the submitted and completed jobs. The @jobsIn counter also</span>
+ 86:       <span class="ruby-comment cmt"># doubles as a unique job ID.</span>
+ 87:       <span class="ruby-ivar">@jobsIn</span> = <span class="ruby-ivar">@jobsOut</span> = <span class="ruby-value">0</span>
+ 88:       <span class="ruby-comment cmt"># An Array that holds all the IO objects to receive data from.</span>
+ 89:       <span class="ruby-ivar">@pipes</span> = []
+ 90:       <span class="ruby-comment cmt"># A hash that maps IO objects to JobInfo objects</span>
+ 91:       <span class="ruby-ivar">@pipeToJob</span> = {}
+ 92: 
+ 93:       <span class="ruby-comment cmt"># This global flag is set to true to signal the threads to terminate.</span>
+ 94:       <span class="ruby-ivar">@terminate</span> = <span class="ruby-keyword kw">false</span>
+ 95:       <span class="ruby-comment cmt"># Sleep time of the threads when no data is pending. This value must be</span>
+ 96:       <span class="ruby-comment cmt"># large enough to allow for a context switch between the sending</span>
+ 97:       <span class="ruby-comment cmt"># (forked-off) process and this process. If it's too large, throughput</span>
+ 98:       <span class="ruby-comment cmt"># will suffer.</span>
+ 99:       <span class="ruby-ivar">@timeout</span> = <span class="ruby-value">0</span><span class="ruby-value">.02</span>
+100: 
+101:       <span class="ruby-constant">Thread</span>.<span class="ruby-identifier">abort_on_exception</span> = <span class="ruby-keyword kw">true</span>
+102:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
 
@@ -202,12 +206,12 @@ Create a <a href="BatchProcessor.html">BatchProcessor</a> object.
       <h3 class="section-bar">Public Instance methods</h3>
 
 
-      <div id="method-M000339" class="method-detail">
-        <a name="M000339"></a>
+      <div id="method-M000976" class="method-detail">
+        <a name="M000976"></a>
 
         <div class="method-heading">
 
-          <a href="#M000339" class="method-signature">
+          <a href="#M000976" class="method-signature">
 
           <span class="method-name">queue</span><span class="method-args">(tag = nil, &amp;block)</span>
 
@@ -224,24 +228,34 @@ block to be executed in a separate process.
 </p>
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000339-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000339-source">
+            onclick="toggleCode('M000976-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000976-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/BatchProcessor.rb, line 94</span>
- 94:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">queue</span>(<span class="ruby-identifier">tag</span> = <span class="ruby-keyword kw">nil</span>, <span class="ruby-operator">&amp;</span><span class="ruby-identifier">block</span>)
- 95:       <span class="ruby-comment cmt"># Create a new JobInfo object for the job and push it to the @queue.</span>
- 96:       <span class="ruby-identifier">jobInfo</span> = <span class="ruby-constant">JobInfo</span>.<span class="ruby-identifier">new</span>(<span class="ruby-ivar">@queue</span>.<span class="ruby-identifier">length</span>, <span class="ruby-identifier">block</span>, <span class="ruby-identifier">tag</span>)
- 97:       <span class="ruby-ivar">@queue</span>.<span class="ruby-identifier">push</span>(<span class="ruby-identifier">jobInfo</span>)
- 98:       <span class="ruby-ivar">@lock</span>.<span class="ruby-identifier">synchronize</span> <span class="ruby-keyword kw">do</span>
- 99:         <span class="ruby-comment cmt"># Add the receiver end of the pipe to the @pipes Array.</span>
-100:         <span class="ruby-ivar">@pipes</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">jobInfo</span>.<span class="ruby-identifier">stdoutP</span>
-101:         <span class="ruby-comment cmt"># Map the pipe end to this JobInfo object.</span>
-102:         <span class="ruby-ivar">@pipeToJob</span>[<span class="ruby-identifier">jobInfo</span>.<span class="ruby-identifier">stdoutP</span>] = <span class="ruby-identifier">jobInfo</span>
-103:         <span class="ruby-comment cmt"># Same for $stderr.</span>
-104:         <span class="ruby-ivar">@pipes</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">jobInfo</span>.<span class="ruby-identifier">stderrP</span>
-105:         <span class="ruby-ivar">@pipeToJob</span>[<span class="ruby-identifier">jobInfo</span>.<span class="ruby-identifier">stderrP</span>] = <span class="ruby-identifier">jobInfo</span>
-106:       <span class="ruby-keyword kw">end</span>
-107:     <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/BatchProcessor.rb, line 107</span>
+107:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">queue</span>(<span class="ruby-identifier">tag</span> = <span class="ruby-keyword kw">nil</span>, <span class="ruby-operator">&amp;</span><span class="ruby-identifier">block</span>)
+108:       <span class="ruby-identifier">raise</span> <span class="ruby-value str">'You cannot call queue() while wait() is running!'</span> <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@jobsOut</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">0</span>
+109: 
+110:       <span class="ruby-comment cmt"># If this is the first queued job for this run, we have to start the</span>
+111:       <span class="ruby-comment cmt"># helper threads.</span>
+112:       <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@jobsIn</span> <span class="ruby-operator">==</span> <span class="ruby-value">0</span>
+113:         <span class="ruby-comment cmt"># The JobInfo objects in the @toRunQueue are processed by the pusher</span>
+114:         <span class="ruby-comment cmt"># thread.  It forkes off processes to execute the code block associated</span>
+115:         <span class="ruby-comment cmt"># with the JobInfo.</span>
+116:         <span class="ruby-ivar">@pusher</span> = <span class="ruby-constant">Thread</span>.<span class="ruby-identifier">new</span> { <span class="ruby-identifier">pusher</span> }
+117:         <span class="ruby-comment cmt"># The popper thread waits for terminated childs and picks up the</span>
+118:         <span class="ruby-comment cmt"># results.</span>
+119:         <span class="ruby-ivar">@popper</span> = <span class="ruby-constant">Thread</span>.<span class="ruby-identifier">new</span> { <span class="ruby-identifier">popper</span> }
+120:         <span class="ruby-comment cmt"># The grabber thread collects $stdout and $stderr data from each child</span>
+121:         <span class="ruby-comment cmt"># process and stores them in the corresponding JobInfo.</span>
+122:         <span class="ruby-ivar">@grabber</span> = <span class="ruby-constant">Thread</span>.<span class="ruby-identifier">new</span> { <span class="ruby-identifier">grabber</span> }
+123:       <span class="ruby-keyword kw">end</span>
+124: 
+125:       <span class="ruby-comment cmt"># Create a new JobInfo object for the job and push it to the @toRunQueue.</span>
+126:       <span class="ruby-identifier">job</span> = <span class="ruby-constant">JobInfo</span>.<span class="ruby-identifier">new</span>(<span class="ruby-ivar">@jobsIn</span>, <span class="ruby-identifier">block</span>, <span class="ruby-identifier">tag</span>)
+127:       <span class="ruby-comment cmt"># Increase job counter</span>
+128:       <span class="ruby-ivar">@lock</span>.<span class="ruby-identifier">synchronize</span> { <span class="ruby-ivar">@jobsIn</span> <span class="ruby-operator">+=</span> <span class="ruby-value">1</span> }
+129:       <span class="ruby-ivar">@toRunQueue</span>.<span class="ruby-identifier">push</span>(<span class="ruby-identifier">job</span>)
+130:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
 
@@ -249,12 +263,12 @@ block to be executed in a separate process.
       </div>
 
 
-      <div id="method-M000340" class="method-detail">
-        <a name="M000340"></a>
+      <div id="method-M000977" class="method-detail">
+        <a name="M000977"></a>
 
         <div class="method-heading">
 
-          <a href="#M000340" class="method-signature">
+          <a href="#M000977" class="method-signature">
 
           <span class="method-name">wait</span><span class="method-args">() {|job| ...}</span>
 
@@ -271,25 +285,45 @@ results.
 </p>
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000340-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000340-source">
+            onclick="toggleCode('M000977-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000977-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/BatchProcessor.rb, line 111</span>
-111:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">wait</span>
-112:       <span class="ruby-keyword kw">while</span> <span class="ruby-operator">!</span><span class="ruby-ivar">@queue</span>.<span class="ruby-identifier">empty?</span> <span class="ruby-operator">||</span> <span class="ruby-ivar">@pendingJobs</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">0</span> <span class="ruby-keyword kw">do</span>
-113:         <span class="ruby-identifier">sleep</span>(<span class="ruby-ivar">@timeout</span>)
-114:       <span class="ruby-keyword kw">end</span>
-115: 
-116:       <span class="ruby-comment cmt"># Signal threads to stop</span>
-117:       <span class="ruby-ivar">@terminate</span> = <span class="ruby-keyword kw">true</span>
-118:       <span class="ruby-comment cmt"># Wait for treads to finish</span>
-119:       <span class="ruby-ivar">@pusher</span>.<span class="ruby-identifier">join</span>
-120:       <span class="ruby-ivar">@popper</span>.<span class="ruby-identifier">join</span>
-121:       <span class="ruby-ivar">@grabber</span>.<span class="ruby-identifier">join</span>
-122: 
-123:       <span class="ruby-comment cmt"># Pass the results of the jobs to the caller.</span>
-124:       <span class="ruby-ivar">@jobs</span>.<span class="ruby-identifier">each_value</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">job</span><span class="ruby-operator">|</span> <span class="ruby-keyword kw">yield</span>(<span class="ruby-identifier">job</span>) }
-125:     <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/BatchProcessor.rb, line 134</span>
+134:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">wait</span>
+135:       <span class="ruby-comment cmt"># When we have received as many jobs in the @toDropQueue than we have</span>
+136:       <span class="ruby-comment cmt"># started then we're done.</span>
+137:       <span class="ruby-keyword kw">while</span> <span class="ruby-operator">!</span><span class="ruby-ivar">@lock</span>.<span class="ruby-identifier">synchronize</span> { <span class="ruby-ivar">@jobsIn</span> <span class="ruby-operator">==</span> <span class="ruby-ivar">@jobsOut</span> }
+138:         <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@toDropQueue</span>.<span class="ruby-identifier">empty?</span>
+139:           <span class="ruby-identifier">sleep</span>(<span class="ruby-ivar">@timeout</span>)
+140:         <span class="ruby-keyword kw">else</span>
+141:           <span class="ruby-comment cmt"># We have completed jobs.</span>
+142:           <span class="ruby-keyword kw">while</span> <span class="ruby-operator">!</span><span class="ruby-ivar">@toDropQueue</span>.<span class="ruby-identifier">empty?</span>
+143:             <span class="ruby-comment cmt"># Pop a job from the @toDropQueue and call the block with it.</span>
+144:             <span class="ruby-identifier">job</span> = <span class="ruby-ivar">@toDropQueue</span>.<span class="ruby-identifier">pop</span>
+145:             <span class="ruby-comment cmt"># Remove the job related entries from the housekeeping tables.</span>
+146:             <span class="ruby-ivar">@lock</span>.<span class="ruby-identifier">synchronize</span> { <span class="ruby-ivar">@jobsOut</span> <span class="ruby-operator">+=</span> <span class="ruby-value">1</span> }
+147: 
+148:             <span class="ruby-comment cmt"># Call the post-processing block that was passed to wait() with</span>
+149:             <span class="ruby-comment cmt"># the JobInfo object as argument.</span>
+150:             <span class="ruby-keyword kw">yield</span>(<span class="ruby-identifier">job</span>)
+151:           <span class="ruby-keyword kw">end</span>
+152:         <span class="ruby-keyword kw">end</span>
+153:       <span class="ruby-keyword kw">end</span>
+154: 
+155:       <span class="ruby-comment cmt"># Signal threads to stop</span>
+156:       <span class="ruby-ivar">@terminate</span> = <span class="ruby-keyword kw">true</span>
+157:       <span class="ruby-comment cmt"># Wait for treads to finish</span>
+158:       <span class="ruby-ivar">@pusher</span>.<span class="ruby-identifier">join</span>
+159:       <span class="ruby-ivar">@popper</span>.<span class="ruby-identifier">join</span>
+160:       <span class="ruby-ivar">@grabber</span>.<span class="ruby-identifier">join</span>
+161: 
+162:       <span class="ruby-comment cmt"># Reset some variables so we can reuse the object for further job runs.</span>
+163:       <span class="ruby-ivar">@jobsIn</span> = <span class="ruby-ivar">@jobsOut</span> = <span class="ruby-value">0</span>
+164:       <span class="ruby-ivar">@terminate</span> = <span class="ruby-keyword kw">false</span>
+165: 
+166:       <span class="ruby-comment cmt"># Make sure all data structures are empty and clean.</span>
+167:       <span class="ruby-identifier">check</span>
+168:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
 

data/doc/classes/TaskJuggler/Booking.html

@@ -95,11 +95,11 @@
 
       <div class="name-list">
 
-        <a href="#M000432">new</a>&nbsp;&nbsp;
+        <a href="#M000694">new</a>&nbsp;&nbsp;
 
-        <a href="#M000433">to_s</a>&nbsp;&nbsp;
+        <a href="#M000695">to_s</a>&nbsp;&nbsp;
 
-        <a href="#M000434">to_tjp</a>&nbsp;&nbsp;
+        <a href="#M000696">to_tjp</a>&nbsp;&nbsp;
 
       </div>
     </div>
@@ -178,12 +178,12 @@
       <h3 class="section-bar">Public Class methods</h3>
 
 
-      <div id="method-M000432" class="method-detail">
-        <a name="M000432"></a>
+      <div id="method-M000694" class="method-detail">
+        <a name="M000694"></a>
 
         <div class="method-heading">
 
-          <a href="#M000432" class="method-signature">
+          <a href="#M000694" class="method-signature">
 
           <span class="method-name">new</span><span class="method-args">(resource, task, intervals)</span>
 
@@ -194,8 +194,8 @@
         <div class="method-description">
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000432-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000432-source">
+            onclick="toggleCode('M000694-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000694-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/Booking.rb, line 20</span>
 20:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">resource</span>, <span class="ruby-identifier">task</span>, <span class="ruby-identifier">intervals</span>)
@@ -216,12 +216,12 @@
       <h3 class="section-bar">Public Instance methods</h3>
 
 
-      <div id="method-M000433" class="method-detail">
-        <a name="M000433"></a>
+      <div id="method-M000695" class="method-detail">
+        <a name="M000695"></a>
 
         <div class="method-heading">
 
-          <a href="#M000433" class="method-signature">
+          <a href="#M000695" class="method-signature">
 
           <span class="method-name">to_s</span><span class="method-args">()</span>
 
@@ -232,8 +232,8 @@
         <div class="method-description">
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000433-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000433-source">
+            onclick="toggleCode('M000695-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000695-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/Booking.rb, line 29</span>
 29:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_s</span>
@@ -255,12 +255,12 @@
       </div>
 
 
-      <div id="method-M000434" class="method-detail">
-        <a name="M000434"></a>
+      <div id="method-M000696" class="method-detail">
+        <a name="M000696"></a>
 
         <div class="method-heading">
 
-          <a href="#M000434" class="method-signature">
+          <a href="#M000696" class="method-signature">
 
           <span class="method-name">to_tjp</span><span class="method-args">()</span>
 
@@ -271,8 +271,8 @@
         <div class="method-description">
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000434-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000434-source">
+            onclick="toggleCode('M000696-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000696-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/Booking.rb, line 42</span>
 42:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_tjp</span>

data/doc/classes/TaskJuggler/BookingListAttribute.html

@@ -95,13 +95,13 @@
 
       <div class="name-list">
 
-        <a href="#M000443">new</a>&nbsp;&nbsp;
+        <a href="#M000849">new</a>&nbsp;&nbsp;
 
-        <a href="#M000444">tjpId</a>&nbsp;&nbsp;
+        <a href="#M000850">tjpId</a>&nbsp;&nbsp;
 
-        <a href="#M000445">to_s</a>&nbsp;&nbsp;
+        <a href="#M000851">to_s</a>&nbsp;&nbsp;
 
-        <a href="#M000446">to_tjp</a>&nbsp;&nbsp;
+        <a href="#M000852">to_tjp</a>&nbsp;&nbsp;
 
       </div>
     </div>
@@ -122,12 +122,12 @@
       <h3 class="section-bar">Public Class methods</h3>
 
 
-      <div id="method-M000443" class="method-detail">
-        <a name="M000443"></a>
+      <div id="method-M000849" class="method-detail">
+        <a name="M000849"></a>
 
         <div class="method-heading">
 
-          <a href="#M000443" class="method-signature">
+          <a href="#M000849" class="method-signature">
 
           <span class="method-name">new</span><span class="method-args">(property, type)</span>
 
@@ -138,8 +138,8 @@
         <div class="method-description">
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000443-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000443-source">
+            onclick="toggleCode('M000849-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000849-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/Attributes.rb, line 93</span>
 93:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">property</span>, <span class="ruby-identifier">type</span>)
@@ -154,12 +154,12 @@
       </div>
 
 
-      <div id="method-M000444" class="method-detail">
-        <a name="M000444"></a>
+      <div id="method-M000850" class="method-detail">
+        <a name="M000850"></a>
 
         <div class="method-heading">
 
-          <a href="#M000444" class="method-signature">
+          <a href="#M000850" class="method-signature">
 
           <span class="method-name">tjpId</span><span class="method-args">()</span>
 
@@ -170,8 +170,8 @@
         <div class="method-description">
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000444-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000444-source">
+            onclick="toggleCode('M000850-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000850-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/Attributes.rb, line 99</span>
  99:     <span class="ruby-keyword kw">def</span> <span class="ruby-constant">BookingListAttribute</span><span class="ruby-operator">::</span><span class="ruby-identifier">tjpId</span>
@@ -187,14 +187,14 @@
       <h3 class="section-bar">Public Instance methods</h3>
 
 
-      <div id="method-M000445" class="method-detail">
-        <a name="M000445"></a>
+      <div id="method-M000851" class="method-detail">
+        <a name="M000851"></a>
 
         <div class="method-heading">
 
-          <a href="#M000445" class="method-signature">
+          <a href="#M000851" class="method-signature">
 
-          <span class="method-name">to_s</span><span class="method-args">()</span>
+          <span class="method-name">to_s</span><span class="method-args">(query = nil)</span>
 
           </a>
 
@@ -203,11 +203,11 @@
         <div class="method-description">
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000445-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000445-source">
+            onclick="toggleCode('M000851-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000851-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/Attributes.rb, line 103</span>
-103:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_s</span>
+103:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_s</span>(<span class="ruby-identifier">query</span> = <span class="ruby-keyword kw">nil</span>)
 104:       <span class="ruby-ivar">@value</span>.<span class="ruby-identifier">collect</span>{ <span class="ruby-operator">|</span><span class="ruby-identifier">x</span><span class="ruby-operator">|</span> <span class="ruby-identifier">x</span>.<span class="ruby-identifier">to_s</span> }.<span class="ruby-identifier">join</span>(<span class="ruby-value str">', '</span>)
 105:     <span class="ruby-keyword kw">end</span>
 </pre>
@@ -217,12 +217,12 @@
       </div>
 
 
-      <div id="method-M000446" class="method-detail">
-        <a name="M000446"></a>
+      <div id="method-M000852" class="method-detail">
+        <a name="M000852"></a>
 
         <div class="method-heading">
 
-          <a href="#M000446" class="method-signature">
+          <a href="#M000852" class="method-signature">
 
           <span class="method-name">to_tjp</span><span class="method-args">()</span>
 
@@ -233,8 +233,8 @@
         <div class="method-description">
 
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000446-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000446-source">
+            onclick="toggleCode('M000852-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000852-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/Attributes.rb, line 107</span>
 107:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_tjp</span>