taskjuggler 3.2.0 → 3.3.0

data/lib/taskjuggler/PropertyList.rb

@@ -12,6 +12,7 @@
 #
 
 require 'taskjuggler/PTNProxy'
+require 'taskjuggler/MessageHandler'
 
 class TaskJuggler
 
@@ -24,6 +25,8 @@ class TaskJuggler
   # PropertySet.
   class PropertyList
 
+    include MessageHandler
+
     attr_writer :query
     attr_reader :propertySet, :query, :sortingLevels, :sortingCriteria,
                 :sortingUp, :scenarioIdx
@@ -72,6 +75,34 @@ class TaskJuggler
       append(adopted)
     end
 
+    # Make sure that the list does not contain the same PropertyTreeNode more
+    # than once. This could happen for adopted tasks. If you use
+    # includeAdopted(), you should call this method after filtering to see if
+    # the filter was strict enough.
+    def checkForDuplicates(sourceFileInfo)
+      ptns = {}
+      @items.each do |i|
+        if ptns.include?(i.ptn)
+          error('proplist_duplicate',
+                "An adopted property is included as #{i.logicalId} and " +
+                "as #{ptns[i.ptn].logicalId}. Please use stronger filtering " +
+                'to avoid including the property more than once!',
+                sourceFileInfo)
+        end
+        ptns[i.ptn] = i
+      end
+    end
+
+
+    # Specialized version of Array::include? that also matches adopted tasks.
+    def include?(node)
+      !@items.find { |p| p.ptn == node.ptn }.nil?
+    end
+
+    def [](node)
+      @items.find { |n| n.ptn == node.ptn }
+    end
+
     def to_ary
       @items.dup
     end
@@ -104,6 +135,7 @@ class TaskJuggler
       end
 
       @items.concat(list)
+      raise "Duplicate items" if @items != @items.uniq
       sort!
     end
 

data/lib/taskjuggler/PropertyTreeNode.rb

@@ -283,6 +283,10 @@ class TaskJuggler
       res
     end
 
+    def logicalId
+      fullId
+    end
+
     # Return the full id of this node. For PropertySet objects with a flat
     # namespace, this is just the ID. Otherwise, the full ID is composed of all
     # IDs from the root node to this node, separating the IDs by a dot.

data/lib/taskjuggler/ResourceScenario.rb

@@ -184,13 +184,8 @@ class TaskJuggler
       #puts "Booking resource #{@property.fullId} at " +
       #     "#{@scoreboard.idxToDate(sbIdx)}/#{sbIdx} for task #{task.fullId}\n"
       @scoreboard[sbIdx] = task
-      # Track the total allocated slots for this resource and all parent
-      # resources.
-      t = @property
-      while t
-        t['effort', @scenarioIdx] += 1
-        t = t.parent
-      end
+      # Track the total allocated slots for this resource.
+      @effort += @efficiency
       @limits.inc(sbIdx) if @limits
 
       # Scoreboard iterations are fairly expensive but they are very frequent
@@ -198,19 +193,16 @@ class TaskJuggler
       # relevant intervals, we store the interval for all bookings and for
       # each individual task.
       if @firstBookedSlot.nil? || @firstBookedSlot > sbIdx
-        @firstBookedSlot = sbIdx
+        @firstBookedSlot = @firstBookedSlots[task] = sbIdx
+      elsif @firstBookedSlots[task].nil? || @firstBookedSlots[task] > sbIdx
+        @firstBookedSlots[task] = sbIdx
       end
       if @lastBookedSlot.nil? || @lastBookedSlot < sbIdx
-        @lastBookedSlot = sbIdx
-      end
-      if task
-        if @firstBookedSlots[task].nil? || @firstBookedSlots[task] > sbIdx
-          @firstBookedSlots[task] = sbIdx
-        end
-        if @lastBookedSlots[task].nil? || @lastBookedSlots[task] < sbIdx
-          @lastBookedSlots[task] = sbIdx
-        end
+        @lastBookedSlot = @lastBookedSlots[task] = sbIdx
+      elsif @lastBookedSlots[task].nil? || @lastBookedSlots[task] < sbIdx
+        @lastBookedSlots[task] = sbIdx
       end
+
       true
     end
 
@@ -253,6 +245,21 @@ class TaskJuggler
       book(sbIdx, booking.task, true)
     end
 
+    # @effort only trackes the already allocated effort for leaf resources. It's
+    # too expensive to propagate this to the group resources on every booking.
+    # If a value for a group effort is needed, it's computed here.
+    def bookedEffort
+      if @property.leaf?
+        @effort
+      else
+        effort = 0
+        @property.kids.each do |r|
+          effort += r.bookedEffort(@scenarioIdx)
+        end
+        effort
+      end
+    end
+
     # Compute the annual leave days within the period specified by the
     # _query_. The result is in days.
     def query_annualleave(query)
@@ -296,6 +303,31 @@ class TaskJuggler
       query.string = query.scaleLoad(effort)
     end
 
+    # The completed (as of 'now') effort allocated for the resource in the
+    # specified interval.  In case a Task is given as scope property only
+    # the effort allocated for this Task is taken into account.
+    def query_effortdone(query)
+      # For this query, we always override the query period.
+      query.sortable = query.numerical = effort =
+        getEffectiveWork(@project.dateToIdx(@project['start'], false),
+                         @project.dateToIdx(@project['now']),
+                         query.scopeProperty)
+      query.string = query.scaleLoad(effort)
+    end
+
+
+    # The remaining (as of 'now') effort allocated for the resource in the
+    # specified interval.  In case a Task is given as scope property only
+    # the effort allocated for this Task is taken into account.
+    def query_effortleft(query)
+      # For this query, we always override the query period.
+      query.sortable = query.numerical = effort =
+        getEffectiveWork(@project.dateToIdx(@project['now']),
+                         @project.dateToIdx(@project['end'], false),
+                         query.scopeProperty)
+      query.string = query.scaleLoad(effort)
+    end
+
     # The unallocated work time of the Resource during the specified interval.
     def query_freetime(query)
       query.sortable = query.numerical = time =
@@ -449,9 +481,10 @@ class TaskJuggler
       # There can't be any effective work if the start is after the end or the
       # todo list doesn't contain the specified task.
       return 0.0 if startIdx >= endIdx || (task && !@duties.include?(task))
+      # Temporary workaround until @duties is fixed again.
 
       # The unique key we use to address the result in the cache.
-      @dCache.cached(self, :ResourceScenarioEffectiveWork, startIdx, endIdx,
+      @dCache.cached(self, :ResourceScenarioGetEffectiveWork, startIdx, endIdx,
                      task) do
         work = 0.0
         if @property.container?
@@ -516,14 +549,14 @@ class TaskJuggler
         end
       else
         if task
-          # If we have a know task, we only include the amount that is
+          # If we have a known task, we only include the amount that is
           # specific to this resource, this task and the chargeset of the
           # task.
           amount += task.turnover(@scenarioIdx, startIdx, endIdx, account,
                                   @property)
         elsif !@chargeset.empty?
           # If no tasks was provided, we include the amount of this resource,
-          # weighted by the charset of this resource.
+          # weighted by the chargeset of this resource.
           totalResourceCost = cost(startIdx, endIdx)
           @chargeset.each do |set|
             set.each do |accnt, share|

data/lib/taskjuggler/RichText/Document.rb

@@ -63,14 +63,16 @@ class TaskJuggler
       @toc = TableOfContents.new
       @references = {}
       @anchors = []
+      # Collect all file names as potentencial anchors.
       @snippets.each do |snip|
         snip.tableOfContents(@toc, snip.name)
         @anchors << snip.name
-        @toc.each do |tocEntry|
-          @anchors << snip.name + '#' + tocEntry.tag
-        end
-        (refs = snip.internalReferences).empty? ||
-          @references[snip.name] = refs
+        (refs = snip.internalReferences).empty? || @references[snip.name] = refs
+      end
+      # Then add all section entries as well. We use the HTML style
+      # <file>#<tag> notation.
+      @toc.each do |tocEntry|
+        @anchors << tocEntry.file + '#' + tocEntry.tag
       end
     end
 

data/lib/taskjuggler/RichText/Scanner.rb

@@ -33,66 +33,66 @@ class TaskJuggler
     def initialize(masterFile, log)
       tokenPatterns = [
         # :bol mode rules
-        [ :LINEBREAK, /\s*\n/, :bol, method('linebreak') ],
-        [ nil, /\s+/, :bol, method('inlineMode') ],
+        [ :LINEBREAK, '\s*\n', /\s*\n/, :bol, method('linebreak') ],
+        [ nil, '\s+', /\s+/, :bol, method('inlineMode') ],
 
         # :bop mode rules
-        [ :PRE, / [^\n]+\n?/, :bop, method('pre') ],
-        [ nil, /\s*\n/, :bop, method('linebreak') ],
+        [ :PRE, ' [^\n]+\n?', / [^\n]+\n?/, :bop, method('pre') ],
+        [ nil, '\s*\n', /\s*\n/, :bop, method('linebreak') ],
 
         # :inline mode rules
-        [ :SPACE, /[ \t\n]+/, :inline, method('space') ],
+        [ :SPACE, '[ \t\n]+', /[ \t\n]+/, :inline, method('space') ],
 
         # :bop and :bol mode rules
-        [ :INLINEFUNCSTART, /<-/, [ :bop, :bol, :inline ],
+        [ :INLINEFUNCSTART, '<-', /<-/, [ :bop, :bol, :inline ],
           method('functionStart') ],
-        [ :BLOCKFUNCSTART, /<\[/, [ :bop, :bol ], method('functionStart') ],
-        [ ':TITLE*', /={2,5}/, [ :bop, :bol ], method('titleStart') ],
-        [ 'TITLE*END', /={2,5}/, :inline, method('titleEnd') ],
-        [ 'BULLET*', /\*{1,4}[ \t]+/, [ :bop, :bol ], method('bullet') ],
-        [ 'NUMBER*', /\#{1,4}[ \t]+/, [ :bop, :bol ], method('number') ],
-        [ :HLINE, /----/, [ :bop, :bol ], method('inlineMode') ],
+        [ :BLOCKFUNCSTART, '<\[', /<\[/, [ :bop, :bol ], method('functionStart') ],
+        [ ':TITLE*', '={2,5}', /={2,5}/, [ :bop, :bol ], method('titleStart') ],
+        [ 'TITLE*END', '={2,5}', /={2,5}/, :inline, method('titleEnd') ],
+        [ 'BULLET*', '\*{1,4}[ \t]+', /\*{1,4}[ \t]+/, [ :bop, :bol ], method('bullet') ],
+        [ 'NUMBER*', '\#{1,4}[ \t]+', /\#{1,4}[ \t]+/, [ :bop, :bol ], method('number') ],
+        [ :HLINE, '----', /----/, [ :bop, :bol ], method('inlineMode') ],
 
         # :bop, :bol and :inline mode rules
         # The <nowiki> token puts the scanner into :nowiki mode.
-        [ nil, /<nowiki>/, [ :bop, :bol, :inline ], method('nowikiStart') ],
-        [ :FCOLSTART, /<fcol:([a-z]+|#[0-9A-Fa-f]{3,6})>/, [ :bop, :bol,
+        [ nil, '<nowiki>', /<nowiki>/, [ :bop, :bol, :inline ], method('nowikiStart') ],
+        [ :FCOLSTART, '<fcol:([a-z]+|#[0-9A-Fa-f]{3,6})>', /<fcol:([a-z]+|#[0-9A-Fa-f]{3,6})>/, [ :bop, :bol,
           :inline ],
           method('fontColorStart') ],
-        [ :FCOLEND, /<\/fcol>/, [ :bop, :bol, :inline ],
+        [ :FCOLEND, '<\/fcol>', /<\/fcol>/, [ :bop, :bol, :inline ],
           method('fontColorEnd') ],
-        [ :QUOTES, /'{2,5}/, [ :bop, :bol, :inline ], method('quotes') ],
-        [ :REF, /\[\[/, [ :bop, :bol, :inline ], method('refStart') ],
-        [ :HREF, /\[/, [ :bop, :bol, :inline], method('hrefStart') ],
-        [ :WORD, /.[^ \n\t\[<']*/, [ :bop, :bol, :inline ],
+        [ :QUOTES, '\'{2,5}', /'{2,5}/, [ :bop, :bol, :inline ], method('quotes') ],
+        [ :REF, '\[\[', /\[\[/, [ :bop, :bol, :inline ], method('refStart') ],
+        [ :HREF, '\[', /\[/, [ :bop, :bol, :inline], method('hrefStart') ],
+        [ :WORD, '.[^ \n\t\[<\']*', /.[^ \n\t\[<']*/, [ :bop, :bol, :inline ],
           method('inlineMode') ],
 
         # :nowiki mode rules
-        [ nil, /<\/nowiki>/, :nowiki, method('nowikiEnd') ],
-        [ :WORD, /(<(?!\/nowiki>)|[^ \t\n<])+/, :nowiki ],
-        [ :SPACE, /[ \t]+/, :nowiki ],
-        [ :LINEBREAK, /\s*\n/, :nowiki ],
+        [ nil, '<\/nowiki>', /<\/nowiki>/, :nowiki, method('nowikiEnd') ],
+        [ :WORD, '(<(?!\/nowiki>)|[^ \t\n<])+', /(<(?!\/nowiki>)|[^ \t\n<])+/, :nowiki ],
+        [ :SPACE, '[ \t]+', /[ \t]+/, :nowiki ],
+        [ :LINEBREAK, '\s*\n', /\s*\n/, :nowiki ],
 
         # :ref mode rules
-        [ :REFEND, /\]\]/, :ref, method('refEnd') ],
-        [ :WORD, /(<(?!-)|(\](?!\])|[^|<\]]))+/, :ref ],
-        [ :QUERY, /<-\w+->/, :ref, method('query') ],
-        [ :LITERAL, /./, :ref ],
+        [ :REFEND, '\]\]', /\]\]/, :ref, method('refEnd') ],
+        [ :WORD, '(<(?!-)|(\](?!\])|[^|<\]]))+', /(<(?!-)|(\](?!\])|[^|<\]]))+/, :ref ],
+        [ :QUERY, '<-\w+->', /<-\w+->/, :ref, method('query') ],
+        [ :LITERAL, '.', /./, :ref ],
 
         # :href mode rules
-        [ :HREFEND, /\]/, :href, method('hrefEnd') ],
-        [ :WORD, /(<(?!-)|[^ \t\n\]<])+/, :href ],
-        [ :QUERY, /<-\w+->/, :href, method('query') ],
-        [ :SPACE, /[ \t\n]+/, :href ],
+        [ :HREFEND, '\]', /\]/, :href, method('hrefEnd') ],
+        [ :WORD, '(<(?!-)|[^ \t\n\]<])+', /(<(?!-)|[^ \t\n\]<])+/, :href ],
+        [ :QUERY, '<-\w+->', /<-\w+->/, :href, method('query') ],
+        [ :SPACE, '[ \t\n]+', /[ \t\n]+/, :href ],
 
         # :func mode rules
-        [ :INLINEFUNCEND, /->/ , :func, method('functionEnd') ],
-        [ :BLOCKFUNCEND, /\]>/, :func, method('functionEnd') ],
-        [ :ID, /[a-zA-Z_]\w*/, :func ],
-        [ :STRING, /"(\\"|[^"])*"/, :func, method('dqString') ],
-        [ :STRING, /'(\\'|[^'])*'/, :func, method('sqString') ],
-        [ nil, /[ \t\n]+/, :func ],
-        [ :LITERAL, /./, :func ]
+        [ :INLINEFUNCEND, '->' , /->/ , :func, method('functionEnd') ],
+        [ :BLOCKFUNCEND, '\]>', /\]>/, :func, method('functionEnd') ],
+        [ :ID, '[a-zA-Z_]\w*', /[a-zA-Z_]\w*/, :func ],
+        [ :STRING, '"(\\\\"|[^"])*"', /"(\\"|[^"])*"/, :func, method('dqString') ],
+        [ :STRING, '\'(\\\\\'|[^\'])*\'', /'(\\'|[^'])*'/, :func, method('sqString') ],
+        [ nil, '[ \t\n]+', /[ \t\n]+/, :func ],
+        [ :LITERAL, '.', /./, :func ]
       ]
       super(masterFile, log, tokenPatterns, :bop)
     end

data/lib/taskjuggler/RichText/TOCEntry.rb

@@ -22,7 +22,7 @@ class TaskJuggler
   # be turned into an HTML tree.
   class TOCEntry
 
-    attr_reader :number, :title, :tag
+    attr_reader :number, :title, :file, :tag
 
     # Create a TOCEntry object.
     # _number_: The section number as String, e. g. '1.2.3' or 'A.3'.

data/lib/taskjuggler/TaskScenario.rb

@@ -18,7 +18,7 @@ class TaskJuggler
 
   class TaskScenario < ScenarioData
 
-    attr_reader :isRunAway
+    attr_reader :isRunAway, :hasDurationSpec
 
     # Create a new TaskScenario object.
     def initialize(task, scenarioIdx, attributes)
@@ -67,19 +67,27 @@ class TaskJuggler
       @startPropagated = false
       @endPropagated = false
 
+      @durationType =
+        if @effort > 0
+          @hasDurationSpec = true
+          :effortTask
+        elsif @length > 0
+          @hasDurationSpec = true
+          :lengthTask
+        elsif @duration > 0
+          @hasDurationSpec = true
+          :durationTask
+        else
+          # If the task is set as milestone is has a duration spec.
+          @hasDurationSpec = @milestone
+          :startEndTask
+        end
+
       markMilestone
-      # Milestones may only have start or end date even when the 'scheduled'
-      # attribute is set. For further processing, we need to add the missing
-      # date.
-      if @milestone
-        @end = @start if @start && !@end
-        @start = @end if !@start && @end
-      end
 
       # For start-end-tasks without allocation, we don't have to do
       # anything but to set the 'scheduled' flag.
-      if @start && @end && @effort == 0 && @length == 0 && @duration == 0 &&
-         @allocate.empty?
+      if @durationType == :startEndTask && @start && @end && @allocate.empty?
         @scheduled = true
         Log.msg { "Task #{@property.fullId}: #{period_to_s}" }
       end
@@ -106,16 +114,10 @@ class TaskJuggler
 
       bookBookings
 
-      @durationType =
-        if @effort > 0
-          :effortTask
-        elsif @length > 0
-          :lengthTask
-        elsif @duration > 0
-          :durationTask
-        else
-          :startEndTask
-        end
+      if @durationType == :startEndTask
+        @startIdx = @project.dateToIdx(@start) if @start
+        @endIdx = @project.dateToIdx(@end) if @end
+      end
     end
 
     # The parser only stores the full task IDs for each of the dependencies.
@@ -377,9 +379,11 @@ class TaskJuggler
         end
       end
 
-      # This list is no longer needed, so let's save some memory. Set it to
+      # These lists are no longer needed, so let's save some memory. Set it to
       # nil so we can detect accidental use.
       @candidates = nil
+      @mandatories = nil
+      @allLimits = nil
     end
 
     # This function is not essential but does perform a large number of
@@ -880,9 +884,9 @@ class TaskJuggler
       return false if @isRunAway
 
       if @forward
-        return true if @start && (hasDurationSpec? || @end)
+        return true if @start && (@hasDurationSpec || @end)
       else
-        return true if @end && (hasDurationSpec? || @start)
+        return true if @end && (@hasDurationSpec || @start)
       end
 
       false
@@ -962,6 +966,10 @@ class TaskJuggler
       # are only set in scheduleContainer().
       if @property.leaf?
         instance_variable_set(('@' + thisEnd).intern, date)
+        if @durationType == :startEndTask
+          instance_variable_set(('@' + thisEnd + 'Idx').intern,
+                                @project.dateToIdx(date))
+        end
         Log.msg { "Task #{@property.fullId}: #{period_to_s}" }
       end
 
@@ -1053,21 +1061,20 @@ class TaskJuggler
 
       hasThatSpec = !instance_variable_get('@' + thatEnd).nil? ||
                     hasStrongDeps?(!atEnd)
-      hasDurationSpec = hasDurationSpec?
 
       # Check for tasks that have no start and end spec, no duration spec but
       # allocates. They can inherit the start and end date.
-      return true if hasThatSpec && !hasDurationSpec && !@allocate.empty?
+      return true if hasThatSpec && !@hasDurationSpec && !@allocate.empty?
 
       if @forward ^ atEnd
         # the scheduling direction is pointing away from this end
-        return true if hasDurationSpec || !@booking.empty?
+        return true if @hasDurationSpec || !@booking.empty?
 
         return hasThatSpec
       else
         # the scheduling direction is pointing towards this end
         return !instance_variable_get('@' + thatEnd).nil? &&
-               !hasDurationSpec && @booking.empty? #&& @allocate.empty?
+               !@hasDurationSpec && @booking.empty? #&& @allocate.empty?
       end
     end
 
@@ -1117,11 +1124,6 @@ class TaskJuggler
       propagateDate(nEnd, true) if endSet
     end
 
-    # Return true if the task has a effort, length or duration setting.
-    def hasDurationSpec?
-      @length > 0 || @duration > 0 || @effort > 0 || @milestone
-    end
-
     # Find the earliest possible start date for the task. This date must be
     # after the end date of all the task that this task depends on.
     # Dependencies may also require a minimum gap between the tasks.
@@ -1669,7 +1671,8 @@ class TaskJuggler
 
     # Gather a list of Resource objects that have been assigned to the task
     # (including sub tasks) for the given Interval _interval_.
-    def assignedResources(interval)
+    def assignedResources(interval = nil)
+      interval = Interval.new(a('start'), a('end')) unless interval
       list = []
 
       if @property.container?
@@ -1746,9 +1749,8 @@ class TaskJuggler
 
         # Depending on the scheduling direction we can mark the task as
         # scheduled once we have reached the other end.
-        currentSlot = @project.idxToDate(@currentSlotIdx)
-        if (@forward && currentSlot + @project['scheduleGranularity'] >= @end) ||
-           (!@forward && currentSlot <= @start)
+        if (@forward && @currentSlotIdx >= @endIdx) |
+           (!@forward && @currentSlotIdx <= @startIdx)
           @scheduled = true
           @property.parents.each do |parent|
             parent.scheduleContainer(@scenarioIdx)
@@ -1920,6 +1922,7 @@ class TaskJuggler
           error('booking_forward_only',
                 "Only forward scheduled tasks may have booking statements.")
         end
+        booked = false
         booking.intervals.each do |interval|
           startIdx = @project.dateToIdx(interval.start, false)
           endIdx = @project.dateToIdx(interval.end, false)
@@ -1927,18 +1930,18 @@ class TaskJuggler
             if booking.resource.bookBooking(@scenarioIdx, idx, booking)
               # Booking was successful for this time slot.
               @doneEffort += booking.resource['efficiency', @scenarioIdx]
+              booked = true
 
               # Store the indexes of the first slot and the slot after the
               # last slot.
               firstSlotIdx = idx if !firstSlotIdx || firstSlotIdx > idx
               lastSlotIdx = idx if !lastSlotIdx || lastSlotIdx < idx
-
-              unless @assignedresources.include?(booking.resource)
-                @assignedresources << booking.resource
-              end
             end
           end
         end
+        if booked && !@assignedresources.include?(booking.resource)
+          @assignedresources << booking.resource
+        end
       end
 
       # For effort based tasks, or tasks without a start date, with bookings
@@ -2094,7 +2097,7 @@ class TaskJuggler
     # This function determines if a task is a milestones and marks it
     # accordingly.
     def markMilestone
-      return if @property.container? || hasDurationSpec? ||
+      return if @property.container? || @hasDurationSpec ||
         !@booking.empty? || !@allocate.empty?
 
       # The following cases qualify for an automatic milestone promotion.
@@ -2112,6 +2115,15 @@ class TaskJuggler
       @milestone = (hasStartSpec && @forward && !hasEndSpec) ||
                    (!hasStartSpec && !@forward && hasEndSpec) ||
                    (!hasStartSpec && !hasEndSpec)
+
+      # Milestones may only have start or end date even when the 'scheduled'
+      # attribute is set. For further processing, we need to add the missing
+      # date.
+      if @milestone
+        @hasDurationSpec = true
+        @end = @start if @start && !@end
+        @start = @end if !@start && @end
+      end
     end
 
     def checkDependency(dependency, depType)
@@ -2180,7 +2192,7 @@ class TaskJuggler
 
       # Don't propagate if the task has a duration or is a milestone and the
       # task end to set is in the scheduling direction.
-      return if task.hasDurationSpec?(@scenarioIdx) &&
+      return if task.hasDurationSpec(@scenarioIdx) &&
                 !(atEnd ^ task['forward', @scenarioIdx])
 
       # Check if all other dependencies for that task end have been determined
@@ -2245,7 +2257,7 @@ class TaskJuggler
           return nil unless (comp = child.calcCompletion(@scenarioIdx))
           completion += comp
         end
-        completion /= @property.children.length
+        completion /= @property.kids.length
       else
         # For leaf tasks we first compare the start and end dates against the
         # current date.
@@ -2380,42 +2392,42 @@ class TaskJuggler
     # current task.
     def inputs(foundInputs, includeChildren, checkedTasks = [])
       # Ignore tasks that we have already included in the checked tasks list.
-      return if checkedTasks.include?(@property)
-      checkedTasks << @property
+      return if checkedTasks.include?([ @property, includeChildren ])
+      checkedTasks << [ @property, includeChildren ]
 
-      # A target must be a leaf function that has no direct or indirect
-      # (through parent) following tasks. Only milestones are recognized as
-      # targets.
+      # An "input" must be a leaf task that has no direct or indirect (through
+      # parent) following tasks. Only milestones are recognized as inputs.
       if @property.leaf? && !hasPredecessors && @milestone
         foundInputs << @property
         return
       end
 
+      # We also include inputs of child tasks if requested. The recursive
+      # iteration of child tasks is limited to the tested task only. The
+      # predecessors children are not iterated. (see further below)
+      if includeChildren
+        @property.kids.each do |child|
+          child.inputs(@scenarioIdx, foundInputs, true, checkedTasks)
+        end
+      end
+
+      # Now check the direct predecessors.
       @startpreds.each do |t, onEnd|
         t.inputs(@scenarioIdx, foundInputs, false, checkedTasks)
       end
 
-      # Check for indirect predecessors.
+      # Check for indirect predecessors inherited from the ancestors.
       if @property.parent
         @property.parent.inputs(@scenarioIdx, foundInputs, false, checkedTasks)
       end
-
-      # Also include targets of child tasks. The recursive iteration of child
-      # tasks is limited to the tested task only. The predecessors are not
-      # iterated.
-      if includeChildren
-        @property.kids.each do |child|
-          child.inputs(@scenarioIdx, foundInputs, true, checkedTasks)
-        end
-      end
     end
 
     # Recursively compile a list of Task properties which depend on the
     # current task.
     def targets(foundTargets, includeChildren, checkedTasks = [])
       # Ignore tasks that we have already included in the checked tasks list.
-      return if checkedTasks.include?(@property)
-      checkedTasks << @property
+      return if checkedTasks.include?([ @property, includeChildren ])
+      checkedTasks << [ @property, includeChildren ]
 
       # A target must be a leaf function that has no direct or indirect
       # (through parent) following tasks. Only milestones are recognized as
@@ -2458,9 +2470,13 @@ class TaskJuggler
         end
       end
 
+      # If we are evaluating the task in the context of a specific resource,
+      # we use the chargeset of that resource, not the chargeset of the task.
+      chargeset = resource ? resource['chargeset', @scenarioIdx] : @chargeset
+
       # If there are no chargeset defined for this task, we don't need to
       # compute the resource related or other cost.
-      unless @chargeset.empty?
+      unless chargeset.empty?
         resourceCost = 0.0
         otherCost = 0.0
 
@@ -2490,7 +2506,7 @@ class TaskJuggler
 
         totalCost = resourceCost + otherCost
         # Now weight the total cost by the share of the account
-        @chargeset.each do |set|
+        chargeset.each do |set|
           set.each do |accnt, share|
             if share > 0.0 && (accnt == account || accnt.isChildOf?(account))
               amount += totalCost * share