Permalink
Browse files

New: Hammock tasks are now supported.

  • Loading branch information...
1 parent ea62086 commit fa464452963dfe580812119e6dc9a92b09dfa5c4 @scrapper scrapper committed Jun 22, 2013
View
@@ -22,6 +22,6 @@ test/TestSuite/HTML-Reports/scripts
test/TestSuite/Syntax/Correct/css
test/TestSuite/Syntax/Correct/icons
test/TestSuite/Syntax/Correct/scripts
-test/TestSuite/Syntax/Correct/*.hmtl
-test/TestSuite/Syntax/Correct/*.cvs
+test/TestSuite/Syntax/Correct/*.html
+test/TestSuite/Syntax/Correct/*.csv
test/TestSuite/Syntax/Correct/*.xml
View
2 TODO
@@ -26,8 +26,6 @@ used instead of the defined charge set.
* Evaluate if account name space should be hierarchical.
-* Hammock tasks
-
* Delta reports that show only the differences between 2 arbitrary
scenarios.
@@ -1214,10 +1214,10 @@ def earliestStart
# task B depends on A and they are specified this way:
# task A: | --> D-
# task B: -D <-- |
- if @end && startDate > @end
- error('weak_start_dep',
- "Task #{@property.fullId} has a too weak start dependencies " +
- "to be scheduled properly.")
+ if @end && (startDate.nil? || startDate > @end)
+ error('impossible_start_dep',
+ "Task #{@property.fullId} has start date dependencies " +
+ "that conflict with the end date #{@end}.")
end
startDate
@@ -1271,10 +1271,10 @@ def latestEnd
# task A precedes B and they are specified this way:
# task A: | --> D-
# task B: -D <-- |
- if @start && (endDate.nil? || endDate > @start)
- error('weak_end_dep',
- "Task #{@property.fullId} has a too weak end dependencies " +
- "to be scheduled properly.")
+ if @start && (endDate.nil? || endDate < @start)
+ error('impossible_end_dep',
+ "Task #{@property.fullId} has end date dependencies " +
+ "that conflict with the start date #{@start}.")
end
endDate
@@ -0,0 +1,27 @@
+project "Hammock tasks" 2013-06-22 +2m
+
+include 'checks.tji'
+
+task m1 "Milestone 1" {
+ start 2013-07-01
+}
+task m2 "Milestone 2" {
+ start 2013-08-01
+}
+task p1 "phase 1" {
+ precedes m2
+ depends m1
+ task f "Foo" {
+ ${FixStart "2013-07-01"}
+ ${FixEnd "2013-08-01"}
+ }
+ task b "Bar" {
+ ${FixStart "2013-07-01"}
+ ${FixEnd "2013-08-01"}
+ }
+}
+
+taskreport "test" {
+ formats html
+ columns name, start, end, chart
+}
@@ -4,10 +4,10 @@ task T1 "T1" {
end 2009-12-31
duration 2w
}
-# MARK: error 8 weak_end_dep
+# MARK: error 8 impossible_end_dep
task T2 "T2" {
precedes !T1
- start 2009-12-01
+ start 2009-12-24
}
task T3 "T3" {
precedes !T2
@@ -1,10 +1,10 @@
project prj "Project" "1.0" 2009-08-16 +6m
task T1 "T1" {
- start 2009-10-01
+ start 2009-09-23
duration 2w
}
-# MARK: error 8 weak_start_dep
+# MARK: error 8 impossible_start_dep
task T2 "T2" {
depends !T1
end 2009-09-30

0 comments on commit fa46445

Please sign in to comment.