[jboss-svn-commits] JBL Code SVN: r17634 - in labs/jbossrules/trunk/drools-solver/drools-solver-examples: src/main/java/org/drools/solver/examples/common/domain and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jan 8 14:22:16 EST 2008
Author: ge0ffrey
Date: 2008-01-08 14:22:16 -0500 (Tue, 08 Jan 2008)
New Revision: 17634
Added:
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/common/domain/PersistableIdComparator.java
Modified:
labs/jbossrules/trunk/drools-solver/drools-solver-examples/data/itc2007/examination/output/exam_comp_set1_ge0ffrey.sln
labs/jbossrules/trunk/drools-solver/drools-solver-examples/data/itc2007/examination/output/exam_comp_set2_ge0ffrey.sln
labs/jbossrules/trunk/drools-solver/drools-solver-examples/data/itc2007/examination/output/exam_comp_set3_ge0ffrey.sln
labs/jbossrules/trunk/drools-solver/drools-solver-examples/data/itc2007/examination/output/exam_comp_set4_ge0ffrey.sln
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/persistence/ExaminationInputConvertor.java
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/persistence/ExaminationOutputConvertor.java
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/solver/examinationScoreRules.drl
Log:
sort exams + fix AFTER score rule
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/data/itc2007/examination/output/exam_comp_set1_ge0ffrey.sln
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/data/itc2007/examination/output/exam_comp_set1_ge0ffrey.sln 2008-01-08 16:12:50 UTC (rev 17633)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/data/itc2007/examination/output/exam_comp_set1_ge0ffrey.sln 2008-01-08 19:22:16 UTC (rev 17634)
@@ -1,607 +1,607 @@
+45, 1
+13, 6
+14, 0
+10, 0
+0, 1
+53, 4
+18, 1
+24, 0
+49, 0
+33, 1
+38, 0
+28, 0
+37, 1
+52, 6
+32, 1
+53, 2
+45, 6
+3, 0
+25, 5
+28, 2
+36, 0
+25, 1
+15, 4
+30, 1
+11, 4
+2, 0
+0, 2
+6, 0
+10, 1
0, 0
-0, 1
-5, 0
+0, 0
10, 0
+10, 0
+15, 6
+5, 1
+35, 0
+10, 6
0, 0
0, 0
+6, 4
+12, 0
+52, 4
+30, 0
+2, 4
+7, 1
+12, 0
+51, 6
+18, 0
+23, 0
+0, 0
+7, 0
+34, 0
+12, 0
+40, 0
+49, 0
+1, 2
+31, 6
+44, 0
+2, 6
+32, 0
+38, 0
+43, 0
+20, 6
+11, 0
+46, 0
+26, 1
+21, 0
+20, 6
+15, 1
+41, 0
+1, 5
+11, 0
+36, 1
+37, 5
+31, 4
+36, 6
+27, 1
+17, 0
0, 4
0, 4
+1, 1
0, 1
+5, 0
+10, 0
+12, 6
0, 1
-0, 0
-0, 0
-0, 0
+47, 1
+37, 6
+15, 0
+45, 0
+20, 0
+26, 0
+7, 6
0, 1
-5, 1
-5, 1
-0, 0
-5, 1
0, 1
-0, 5
-0, 1
5, 1
+13, 0
+6, 4
0, 0
-5, 4
-10, 1
-10, 1
-0, 6
0, 1
-5, 4
0, 0
+6, 4
+47, 1
+38, 6
+1, 5
+25, 6
+15, 0
+53, 0
0, 0
+20, 0
+1, 6
+11, 0
+31, 6
+41, 4
+16, 0
+21, 5
+26, 4
+6, 6
0, 1
+5, 5
+10, 0
+16, 0
+35, 4
+10, 0
+21, 0
+1, 6
+5, 6
+42, 0
+48, 0
+22, 0
+10, 0
+8, 4
+51, 4
+46, 6
+2, 6
+40, 6
+11, 1
+2, 1
+47, 0
+6, 2
+39, 0
+50, 4
+6, 0
+8, 0
+52, 0
+31, 0
+35, 0
0, 0
+30, 0
+20, 0
+1, 0
+14, 0
+46, 1
+40, 0
+23, 0
+50, 2
+30, 1
+16, 1
+21, 0
+11, 0
+5, 5
+0, 0
+35, 1
+6, 0
+22, 1
+12, 1
+42, 1
+0, 4
+42, 1
+9, 0
+37, 0
+22, 2
+24, 2
+43, 0
+27, 2
+0, 5
+0, 0
+7, 0
+0, 0
+6, 0
+17, 5
+27, 0
+11, 6
+2, 1
+25, 4
+20, 5
+5, 6
+10, 4
+0, 5
+15, 5
+0, 5
+15, 1
+30, 5
+2, 5
+25, 4
+20, 1
+11, 0
5, 1
+52, 2
+11, 5
+53, 4
+42, 6
+18, 4
0, 1
+26, 0
5, 1
+17, 1
+11, 6
+1, 6
+53, 0
+27, 0
+45, 4
+33, 0
+51, 0
+40, 4
+16, 0
+12, 4
+10, 1
+30, 0
+5, 1
+52, 0
+46, 1
+45, 0
+20, 0
+30, 0
+0, 0
+40, 0
+25, 0
+6, 4
+37, 0
+35, 0
+5, 1
15, 0
+25, 0
+40, 0
+20, 1
+53, 0
+20, 0
+35, 0
+52, 0
+5, 1
+10, 1
+17, 4
+47, 1
+4, 0
+26, 6
+37, 0
+23, 1
+46, 2
0, 0
+43, 1
+2, 2
+40, 0
+21, 1
+50, 5
+1, 6
+11, 4
+6, 5
+31, 0
+45, 0
+13, 1
+16, 4
+22, 0
+38, 1
+52, 0
+26, 0
+8, 0
+7, 0
+7, 0
+15, 0
+10, 1
+25, 0
0, 0
+1, 6
+50, 0
+15, 0
+0, 0
+5, 1
+20, 0
10, 0
-15, 0
-15, 0
-0, 1
-5, 4
+19, 0
+14, 1
1, 0
0, 1
-0, 0
-10, 1
-1, 1
-0, 0
-10, 1
+42, 0
+27, 6
+30, 4
+10, 0
+41, 0
+30, 4
+22, 6
0, 1
+15, 4
0, 1
-5, 4
-0, 4
-0, 0
-5, 4
-5, 4
+20, 4
+46, 0
+25, 1
+52, 1
+48, 2
+32, 6
+10, 0
0, 1
-0, 0
-5, 1
+47, 1
+51, 0
+37, 4
+36, 1
0, 1
5, 4
+0, 1
5, 4
-10, 0
-5, 4
-10, 0
-5, 1
-0, 5
-5, 1
-0, 0
-15, 0
-0, 1
5, 5
10, 0
1, 4
6, 0
-20, 0
-1, 4
-5, 6
-10, 1
-5, 5
+5, 4
+5, 4
10, 0
-6, 1
-1, 4
-1, 4
5, 5
-10, 1
-0, 0
-5, 5
-5, 5
-25, 0
-25, 0
-5, 1
-0, 0
-0, 5
-1, 4
10, 0
-10, 0
-5, 1
-20, 0
-10, 0
1, 4
6, 0
-1, 5
-6, 0
15, 1
20, 1
-30, 0
+5, 4
+10, 0
1, 5
-15, 0
-25, 0
-0, 0
-1, 5
-6, 4
-1, 5
+6, 0
1, 6
-20, 0
-15, 0
+6, 0
15, 1
20, 1
-0, 0
-10, 4
-1, 6
-0, 0
-6, 4
-0, 0
-1, 6
-35, 0
-1, 6
15, 1
20, 1
-6, 0
-5, 6
-10, 0
-15, 1
+21, 6
+5, 1
+5, 1
+15, 0
+0, 0
10, 1
-6, 4
-0, 0
-6, 4
-0, 5
-11, 0
-25, 0
-1, 6
-6, 0
-10, 0
-0, 0
-0, 5
-5, 6
-10, 4
30, 0
-6, 4
-11, 1
-0, 0
-6, 0
-0, 0
-10, 1
-40, 0
-1, 6
20, 0
+0, 1
35, 1
+10, 1
15, 0
-20, 0
-6, 0
-2, 0
-2, 0
-1, 6
-6, 0
-15, 1
-30, 0
-45, 0
+0, 0
+40, 0
+53, 4
+12, 2
+34, 2
+17, 0
+6, 1
+9, 0
+49, 6
+19, 0
+44, 2
2, 1
+40, 2
+16, 5
+29, 0
+5, 2
0, 6
-11, 0
-15, 1
-15, 0
-20, 1
-15, 4
-7, 0
-2, 1
-2, 4
-7, 1
-12, 0
-11, 0
-6, 0
-40, 0
-6, 0
-15, 5
-2, 5
-20, 1
-16, 0
-2, 0
-11, 0
-10, 5
-16, 1
-21, 0
-35, 0
+18, 6
+6, 1
+41, 1
+43, 6
+27, 4
+21, 4
+11, 1
+16, 5
+50, 6
+35, 6
+0, 6
+10, 0
+8, 0
25, 1
-11, 0
-15, 5
-20, 0
-15, 0
-20, 4
-15, 4
-11, 0
-6, 5
-7, 0
50, 0
-20, 4
-2, 0
-0, 2
-20, 5
-52, 0
-11, 4
-16, 4
-25, 0
-20, 4
-50, 1
-21, 0
+12, 5
+0, 1
+53, 6
+18, 2
+36, 0
+17, 6
+48, 0
+0, 3
+30, 6
6, 0
-11, 0
-2, 0
-26, 0
-15, 4
-16, 1
-25, 1
-20, 0
-30, 1
-16, 5
-30, 0
-35, 0
-6, 5
+5, 0
+41, 0
+34, 0
+47, 0
+44, 0
31, 0
-25, 0
-30, 1
-6, 0
-10, 0
-15, 6
-2, 1
-20, 6
+42, 4
+27, 0
12, 0
-2, 0
-11, 5
-16, 1
-6, 6
+7, 0
40, 0
-45, 0
-2, 0
-36, 0
-35, 1
-25, 4
-25, 1
-2, 0
-30, 1
-16, 0
-7, 0
-25, 4
-21, 1
-30, 4
-41, 0
-30, 4
+46, 4
+41, 6
+30, 0
+8, 6
+42, 1
+0, 0
+25, 0
+15, 0
+20, 0
50, 1
-21, 0
-16, 6
-21, 0
-2, 1
-30, 5
-31, 0
-16, 5
-30, 6
-41, 0
-52, 0
-31, 1
-41, 0
-35, 1
30, 0
-20, 0
-11, 0
-25, 0
-26, 1
-40, 1
-21, 1
-11, 4
-36, 1
-16, 6
-20, 5
-40, 1
-2, 0
-11, 0
+40, 0
52, 0
22, 0
-17, 0
-6, 0
-31, 1
-25, 5
-11, 0
-20, 6
-2, 6
-17, 1
+35, 0
+0, 5
+10, 4
45, 0
-26, 1
-17, 0
-11, 6
-7, 0
-25, 0
+5, 1
+10, 0
+7, 4
+0, 1
+5, 4
+0, 0
+0, 1
+28, 1
45, 1
-7, 0
-2, 6
-20, 6
-21, 4
-30, 0
-7, 0
-46, 0
-50, 4
-11, 6
-46, 1
-51, 0
-16, 0
-40, 0
-7, 0
17, 4
-35, 4
-30, 0
-51, 0
-35, 5
-45, 1
-31, 4
-15, 0
-41, 1
-36, 1
-35, 6
-12, 0
-10, 0
-7, 4
-12, 0
-21, 5
-26, 4
-53, 0
-7, 5
-35, 0
-17, 5
+15, 2
+48, 6
+30, 2
+21, 0
+47, 2
+25, 0
+36, 5
+13, 2
+14, 6
+48, 1
+22, 0
+42, 2
+13, 4
+8, 5
40, 0
-45, 0
-46, 0
+53, 4
+52, 5
+1, 0
+29, 0
+20, 2
+5, 1
+23, 0
22, 0
-31, 5
-17, 6
-22, 1
-12, 0
-12, 0
-41, 0
-8, 0
-52, 0
-22, 1
-12, 1
-27, 0
-40, 4
-21, 6
-17, 6
35, 0
-12, 1
-46, 1
-50, 5
-25, 6
-12, 4
-27, 0
-36, 4
-46, 0
-7, 6
-31, 6
-31, 0
-26, 0
-8, 1
-7, 6
-8, 4
-36, 5
-40, 5
-51, 1
-36, 6
-27, 1
-20, 0
-1, 0
-45, 4
-0, 3
-46, 4
-1, 0
-41, 0
+11, 0
+17, 0
+0, 0
+53, 1
+4, 0
25, 0
-31, 6
-32, 0
-41, 4
-26, 0
-17, 1
-37, 0
-41, 0
-26, 5
-42, 0
-46, 5
-18, 0
-51, 0
30, 0
-41, 5
-50, 6
-41, 6
-22, 0
-32, 0
-18, 1
-46, 6
-18, 4
+2, 0
+16, 6
+11, 0
+20, 5
+1, 4
+0, 5
+5, 6
+15, 5
+10, 0
33, 0
-40, 0
-23, 0
-10, 0
+3, 0
+33, 0
+31, 5
+21, 2
+40, 5
+6, 0
13, 0
18, 0
+41, 0
+20, 4
+32, 0
+6, 0
+45, 1
+5, 4
+20, 6
+50, 0
27, 0
-50, 0
-51, 0
-46, 0
-37, 1
-51, 4
-8, 5
-18, 0
-26, 0
-40, 6
-37, 4
-40, 2
-37, 5
-0, 4
-37, 0
-52, 1
-45, 0
-14, 0
-53, 0
-13, 1
-31, 0
-12, 5
-8, 6
-42, 1
-13, 4
-42, 0
32, 0
-32, 1
-27, 4
-48, 0
-23, 0
-12, 6
-37, 6
-52, 0
-42, 4
-27, 0
-15, 6
-45, 6
-6, 1
+26, 5
+1, 1
5, 0
-8, 0
-9, 0
-41, 2
-48, 0
-52, 4
+17, 6
+22, 1
+51, 0
+36, 4
+1, 0
+1, 4
42, 0
-48, 0
-52, 6
-53, 1
-13, 0
-51, 6
-53, 0
-1, 1
+41, 0
5, 0
18, 0
-42, 6
-48, 1
-20, 2
-26, 6
-2, 2
-27, 6
-53, 6
-48, 6
-5, 0
-29, 0
-34, 0
-38, 0
-43, 0
-22, 6
-32, 0
-13, 0
-11, 1
-38, 1
-28, 0
-44, 0
-28, 1
-33, 1
-43, 1
-22, 0
-23, 0
-13, 6
-43, 0
-23, 1
-46, 2
-36, 0
-35, 0
-38, 6
-3, 0
-6, 2
+0, 0
+11, 0
+18, 0
+7, 5
+12, 0
+0, 4
+6, 0
39, 0
28, 6
-47, 0
-18, 6
-13, 2
-53, 2
-14, 1
-18, 2
+30, 1
+8, 1
+16, 2
+15, 6
+35, 5
+13, 0
+1, 4
+24, 0
+16, 1
+1, 4
21, 0
-43, 6
-33, 0
+46, 0
+0, 0
+45, 1
+41, 5
+16, 6
+31, 1
+11, 0
+26, 1
+6, 0
+40, 1
+23, 4
23, 6
-10, 6
-5, 2
-15, 2
-29, 1
-50, 0
-49, 0
-32, 6
-16, 2
-1, 0
-49, 6
-4, 0
-33, 0
-21, 2
-8, 0
-1, 2
-23, 2
-14, 6
-38, 0
-28, 0
-19, 0
-3, 0
-24, 0
-48, 2
-44, 0
-42, 2
-22, 2
-52, 2
-30, 2
-50, 2
-34, 0
-24, 0
-12, 2
-34, 2
-44, 2
-24, 2
-39, 0
-47, 0
-47, 2
-28, 2
-37, 0
-27, 2
-4, 0
-36, 0
-49, 0
-9, 0
-29, 0
-14, 0
-17, 0
-19, 0
+42, 1
+40, 0
+22, 0
47, 1
-53, 4
-47, 1
-53, 4
-53, 4
-40, 0
16, 0
-47, 1
53, 4
-40, 0
-0, 1
-47, 1
-42, 1
-40, 0
-0, 1
-10, 0
-17, 4
+6, 5
+2, 0
+2, 0
+2, 0
+17, 1
+23, 2
22, 0
-42, 1
-22, 0
+28, 0
+29, 1
+7, 0
+2, 0
+7, 0
+2, 0
+7, 6
+12, 0
+0, 0
+2, 0
53, 4
+41, 0
17, 4
+12, 1
+20, 0
+0, 1
+5, 1
+31, 0
+0, 0
+46, 0
10, 0
+36, 0
+51, 0
+15, 1
+26, 0
+5, 1
+41, 2
+35, 1
+15, 4
+53, 4
+25, 0
+15, 0
+1, 5
+51, 1
+45, 0
+20, 4
+0, 0
+46, 5
+5, 5
0, 1
-45, 1
-45, 1
-0, 1
-23, 4
+40, 1
+31, 1
+10, 1
+25, 0
+2, 0
+50, 1
+15, 0
+10, 1
30, 1
-40, 0
-53, 4
-53, 4
-5, 1
-5, 1
-5, 1
-10, 0
45, 1
-10, 0
-52, 5
-22, 0
-42, 1
-47, 1
+25, 0
+0, 0
+32, 0
+21, 1
+16, 1
+11, 0
+1, 6
+6, 4
+2, 1
+48, 0
+5, 4
+10, 5
+0, 0
+5, 4
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/data/itc2007/examination/output/exam_comp_set2_ge0ffrey.sln
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/data/itc2007/examination/output/exam_comp_set2_ge0ffrey.sln 2008-01-08 16:12:50 UTC (rev 17633)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/data/itc2007/examination/output/exam_comp_set2_ge0ffrey.sln 2008-01-08 19:22:16 UTC (rev 17634)
@@ -1,870 +1,870 @@
+8, 31
+13, 31
+23, 34
+4, 6
+12, 25
+10, 30
+22, 22
+16, 25
+7, 31
+0, 31
+7, 28
+4, 22
+0, 31
+0, 2
+6, 2
+1, 32
+38, 31
+7, 31
+12, 28
+4, 34
+0, 9
+10, 25
+5, 29
+1, 22
+10, 13
0, 0
-0, 1
-0, 1
-0, 2
-0, 1
-0, 1
-0, 2
-0, 2
-0, 2
-0, 2
-0, 2
-0, 2
-0, 2
-0, 1
-0, 2
-0, 2
+4, 1
+4, 28
+5, 21
+7, 21
+0, 18
+10, 0
+12, 0
+7, 10
4, 0
0, 1
+0, 31
+0, 11
+16, 47
+1, 30
+13, 0
+19, 1
+9, 0
+5, 47
+22, 21
+10, 32
0, 0
+16, 24
+4, 46
+0, 0
+22, 0
+12, 0
+5, 30
+19, 0
0, 1
+0, 22
+0, 24
+25, 2
+27, 1
+5, 1
+7, 19
+0, 21
+0, 32
+7, 1
+4, 1
+10, 0
+0, 1
+1, 28
+1, 1
5, 0
-0, 2
-0, 2
-0, 2
+7, 2
+16, 18
+12, 20
+5, 22
+1, 2
0, 0
-0, 3
-0, 3
-0, 2
-0, 2
+7, 1
0, 0
+12, 33
+7, 18
+10, 0
+16, 8
0, 1
-0, 2
-0, 2
+5, 7
+4, 31
+27, 30
+23, 31
+9, 1
+25, 20
+30, 30
+19, 23
+0, 1
+5, 1
+0, 12
+10, 0
+12, 0
+12, 0
+7, 47
+1, 31
+12, 7
+2, 0
+19, 6
+0, 25
+10, 1
+5, 24
+7, 6
+0, 29
+4, 31
0, 3
0, 2
+4, 29
0, 1
-0, 1
-0, 2
-0, 2
-0, 2
+7, 21
+11, 1
+0, 38
+22, 2
4, 1
-0, 0
-0, 1
+7, 15
+16, 1
+5, 1
+39, 0
+0, 32
+0, 44
+4, 47
+0, 16
+7, 22
0, 2
-0, 2
-0, 2
-1, 0
+4, 0
+10, 39
+4, 20
0, 0
-0, 2
-0, 2
-0, 2
-0, 2
-0, 2
+12, 24
+7, 31
+4, 27
4, 0
-0, 2
-0, 0
-0, 2
-0, 0
-4, 1
-0, 2
+12, 8
+32, 0
+5, 31
+5, 34
+0, 18
+0, 13
+20, 0
+2, 1
0, 1
-0, 2
+22, 34
+12, 31
+10, 47
+7, 0
+0, 1
5, 1
-7, 0
+10, 24
+0, 29
+5, 8
+4, 0
+0, 19
0, 2
+5, 18
+1, 0
+22, 0
+10, 0
+12, 0
+19, 0
+16, 1
0, 1
+5, 1
+7, 6
+19, 0
+25, 2
+7, 12
+27, 1
+10, 0
+30, 0
+12, 0
+19, 0
+7, 12
+16, 1
0, 1
+5, 1
0, 1
0, 1
-0, 0
+10, 0
+1, 34
+7, 0
+6, 0
+2, 3
+4, 21
+0, 25
+5, 20
+16, 1
+10, 0
+0, 30
+7, 25
+10, 0
+7, 10
0, 1
-0, 2
-0, 2
+12, 0
4, 0
+22, 0
+12, 0
+5, 1
0, 1
+0, 13
+5, 1
+7, 0
+4, 0
0, 2
-0, 1
-0, 1
-0, 1
-0, 3
-0, 1
-0, 1
+4, 0
+0, 9
+4, 0
+0, 19
0, 2
-5, 1
0, 2
-5, 1
-0, 1
-0, 1
0, 2
-0, 1
+0, 34
+7, 34
+5, 0
+4, 34
+0, 34
+7, 28
+7, 0
0, 2
-4, 1
4, 0
-0, 0
-0, 1
0, 2
+1, 6
+7, 0
+0, 6
+4, 0
+0, 6
+7, 0
0, 2
+4, 0
+0, 6
+19, 21
0, 2
+4, 0
+7, 31
+7, 0
0, 2
+7, 0
+0, 2
+1, 34
+0, 31
+12, 21
+10, 1
+7, 0
4, 0
+1, 0
0, 2
+16, 20
+10, 20
+0, 25
+0, 34
+22, 31
+7, 31
+12, 18
+1, 20
+0, 15
+7, 0
+0, 2
+7, 0
+4, 3
+12, 1
+0, 20
+16, 2
+10, 6
+19, 0
4, 0
+0, 8
+10, 18
0, 2
+4, 0
+11, 31
+25, 31
+0, 2
+0, 8
+4, 3
0, 0
-0, 1
-0, 3
0, 0
-0, 1
+4, 1
0, 0
-0, 0
-0, 1
+4, 25
+7, 1
+6, 0
+0, 12
+0, 2
+0, 9
+7, 9
5, 1
-5, 1
-4, 0
-0, 1
-0, 1
16, 0
0, 1
+10, 12
0, 2
4, 0
-0, 1
+0, 7
+4, 0
+7, 0
+5, 1
+10, 1
0, 2
-4, 2
-5, 2
-7, 1
5, 1
-7, 2
-4, 2
-4, 0
-0, 1
+10, 8
+7, 8
+4, 32
+4, 47
0, 2
-4, 0
-5, 1
+1, 0
+7, 32
+7, 46
+1, 0
+4, 12
+7, 22
0, 1
-4, 0
0, 6
-4, 0
-7, 0
-7, 0
-0, 6
+0, 16
+4, 34
+0, 31
+0, 21
+7, 34
+4, 31
+1, 0
+1, 3
+5, 34
+8, 0
+1, 0
+4, 34
+16, 28
+7, 38
+10, 30
+4, 30
+0, 31
+4, 30
+10, 21
0, 1
0, 6
-0, 6
-0, 6
-4, 1
-4, 1
-4, 2
-0, 1
-0, 3
-0, 6
-5, 1
-0, 1
-5, 1
+7, 23
+0, 31
4, 0
-0, 6
-0, 6
-5, 1
-0, 7
+0, 2
+5, 12
+0, 28
+0, 18
4, 0
+0, 2
+0, 20
+1, 47
+6, 0
+16, 13
+5, 23
+0, 34
+7, 30
+4, 22
+1, 0
+10, 21
+12, 1
+19, 3
+5, 15
+16, 12
+10, 7
+7, 6
0, 1
+5, 12
+0, 2
0, 1
-5, 1
-0, 7
-4, 0
+5, 10
+16, 7
0, 1
-5, 1
-4, 2
-0, 7
-7, 0
-7, 3
-0, 3
-5, 1
-0, 7
-0, 1
-5, 1
-4, 0
-4, 0
-0, 7
-0, 8
10, 0
-0, 3
+0, 12
+7, 13
+12, 0
+22, 0
+0, 2
+7, 13
+10, 1
4, 0
-5, 1
-0, 8
-0, 8
-7, 6
-4, 0
-7, 6
-7, 0
-7, 0
-10, 1
-7, 7
-7, 7
-4, 1
0, 1
0, 1
4, 0
-5, 1
-4, 2
-5, 1
7, 6
-4, 0
-0, 8
-7, 0
+0, 6
+19, 0
0, 1
-0, 9
-0, 1
-7, 0
-0, 1
-4, 0
-0, 9
-4, 0
-0, 9
5, 1
-7, 8
-0, 10
-5, 1
-7, 6
-0, 11
-4, 1
+12, 1
+0, 22
10, 0
-7, 0
-7, 2
-10, 1
-0, 10
-10, 0
-0, 10
-0, 3
-0, 11
-7, 6
+0, 2
4, 0
-5, 1
-7, 6
-5, 1
-7, 9
-10, 1
-10, 1
-0, 12
+16, 1
+0, 7
12, 0
-0, 3
-4, 1
-7, 9
-5, 1
-7, 0
-4, 1
-10, 2
-12, 0
-0, 12
-0, 13
-7, 10
-0, 12
-0, 13
-10, 0
-7, 10
-0, 13
-5, 1
-0, 15
-0, 12
+16, 1
+0, 2
4, 0
-12, 1
-4, 0
-7, 2
-0, 12
-12, 1
-4, 2
-0, 15
-0, 15
-0, 16
-12, 0
-16, 1
7, 0
-7, 0
-7, 0
-5, 1
-0, 16
-10, 0
-4, 0
-0, 3
-0, 0
-4, 0
-10, 0
-0, 3
19, 0
-7, 0
-4, 0
-0, 18
-0, 12
7, 11
10, 0
-5, 3
+16, 1
+12, 0
+5, 9
+0, 30
+0, 1
+5, 1
+0, 2
+0, 46
+7, 30
+12, 15
10, 1
-10, 1
-10, 2
-12, 2
-10, 0
-0, 3
-0, 18
-4, 0
-0, 18
-0, 18
-0, 19
-7, 12
-10, 0
-7, 12
-4, 0
-0, 19
-7, 0
-12, 0
-12, 0
-0, 20
-0, 20
12, 1
+0, 10
5, 1
-7, 0
-10, 1
-7, 0
+7, 6
+16, 2
+19, 2
+10, 2
+0, 23
+12, 12
+5, 3
0, 20
-0, 20
-16, 1
-12, 1
-12, 1
-4, 2
-0, 21
-5, 6
-10, 0
-0, 22
-0, 0
+7, 1
12, 0
-0, 22
-7, 12
-4, 2
-0, 21
-4, 1
-7, 12
-0, 22
-5, 6
-0, 22
-0, 20
4, 0
-0, 21
-4, 0
+0, 1
10, 0
-12, 0
-7, 13
-16, 1
-0, 23
+10, 0
0, 22
-16, 2
-10, 3
-10, 0
-0, 24
-7, 2
-0, 25
-5, 6
-0, 24
-5, 0
-5, 7
-10, 0
-12, 0
-0, 21
4, 0
-7, 13
-16, 1
-4, 0
7, 0
-0, 24
+1, 25
+22, 1
+5, 34
+0, 46
+22, 0
+4, 16
+0, 20
4, 0
-7, 15
-5, 7
-0, 0
-0, 25
-7, 15
-16, 1
-0, 25
-0, 25
+1, 46
+33, 0
+7, 23
+16, 6
+2, 0
+10, 31
+19, 47
4, 0
-16, 2
-16, 1
19, 0
-7, 3
-0, 27
+12, 1
+0, 11
+4, 0
16, 1
-4, 0
-0, 27
-12, 0
-4, 0
-4, 3
+5, 30
+5, 31
+0, 31
+1, 31
+0, 2
0, 28
-0, 28
-0, 28
-4, 2
-0, 28
-4, 3
+4, 7
+7, 25
+4, 24
+8, 34
+27, 31
+12, 34
7, 0
-7, 16
+26, 31
+23, 0
+5, 25
+37, 0
+10, 16
+22, 2
+25, 1
10, 1
-7, 18
-10, 1
-0, 29
-0, 29
-19, 0
-10, 1
-0, 30
-7, 0
+30, 1
+27, 0
+0, 34
+7, 12
+14, 0
+16, 30
+28, 31
+31, 0
+0, 0
0, 31
-0, 21
-7, 18
-12, 3
-16, 3
+0, 28
+38, 0
+4, 2
+4, 2
+5, 2
+4, 2
+0, 0
+0, 7
+0, 3
+0, 0
+0, 1
+5, 0
10, 1
+12, 1
7, 0
-4, 1
-5, 8
+25, 1
+0, 2
+16, 1
22, 0
-4, 3
-10, 0
+19, 0
+0, 2
+0, 2
+0, 1
+7, 0
+0, 6
12, 1
-19, 0
-5, 9
-16, 6
10, 1
+16, 2
+7, 3
4, 1
-7, 0
-10, 1
+0, 2
+12, 1
+19, 2
+7, 2
+0, 0
+7, 1
+0, 0
+19, 2
+0, 3
+4, 1
10, 2
-19, 1
-4, 3
+4, 1
+0, 12
10, 0
-4, 6
-4, 6
-7, 19
+25, 0
+5, 1
+12, 0
+0, 1
+0, 7
+10, 1
+0, 21
+0, 0
+12, 1
+0, 3
4, 1
-22, 0
-10, 6
-5, 10
-19, 0
-7, 0
-0, 31
+7, 9
+12, 2
+0, 1
+5, 1
+16, 3
+4, 1
+10, 3
0, 0
+5, 1
+7, 7
+0, 1
+4, 2
+22, 3
+0, 3
7, 0
-0, 31
-10, 6
+0, 1
+7, 7
+5, 1
7, 2
-16, 1
-7, 0
-10, 0
-7, 20
-0, 32
-10, 3
-7, 20
-7, 20
+4, 2
+7, 3
0, 0
-10, 0
-10, 7
-12, 1
-22, 0
-7, 2
-7, 21
-12, 3
-0, 31
-0, 32
-7, 0
-10, 8
-0, 31
-5, 12
-5, 12
-12, 0
-4, 7
-4, 8
-5, 13
-7, 1
+0, 2
+22, 1
+5, 3
+25, 3
4, 1
-7, 0
-4, 9
-4, 10
-7, 22
4, 1
-7, 22
-16, 1
-0, 31
-19, 2
-12, 1
-7, 21
-12, 1
-16, 1
-19, 2
-4, 12
-7, 22
-7, 23
-19, 0
-25, 0
-10, 9
-12, 6
-0, 30
-4, 13
-12, 33
-0, 31
-7, 1
-0, 31
-0, 30
-0, 31
-4, 12
-7, 1
-10, 12
-12, 1
-16, 7
+12, 21
+4, 2
+4, 1
10, 2
-25, 1
-7, 1
+0, 1
+0, 1
+7, 12
+0, 1
+27, 2
+10, 0
+4, 0
12, 0
-12, 7
-12, 8
-5, 15
-12, 12
-12, 0
-19, 2
+5, 1
+4, 0
27, 0
-19, 0
-10, 2
-10, 12
-0, 31
-10, 13
-19, 0
-0, 30
+30, 1
+0, 1
+0, 1
10, 0
-7, 23
-4, 15
-5, 16
-10, 15
-22, 0
-12, 13
-0, 31
-0, 31
-16, 8
-7, 21
-0, 0
-25, 2
-27, 1
-30, 0
-0, 31
-12, 15
-4, 16
-10, 16
-22, 1
-16, 2
-4, 18
-10, 0
-7, 24
-0, 32
+7, 0
+0, 2
+4, 0
+1, 1
4, 20
-16, 12
-22, 2
-4, 20
-0, 34
-16, 12
-19, 0
-10, 0
-5, 18
-12, 0
-4, 21
-10, 18
-19, 3
-7, 25
-16, 3
-12, 0
-4, 21
-4, 22
-22, 0
-0, 38
-10, 39
-7, 25
-0, 34
+0, 24
+0, 3
+11, 0
0, 30
-7, 27
-10, 20
-7, 28
-5, 20
-10, 0
-16, 2
-16, 13
-4, 22
-25, 1
-27, 0
-22, 3
-5, 3
-0, 23
-10, 20
-10, 21
-5, 20
-16, 15
-0, 34
-0, 34
-0, 34
-12, 18
-25, 3
-27, 2
+7, 31
+2, 0
+0, 3
0, 40
-19, 3
-7, 28
-0, 34
+0, 3
+6, 34
+0, 21
+5, 46
+10, 46
+7, 2
+9, 0
+0, 21
+4, 31
+0, 3
+9, 0
+0, 47
4, 23
-0, 43
-22, 1
-0, 44
7, 29
-12, 20
-0, 46
-4, 24
-10, 22
-12, 0
-19, 6
-22, 2
-0, 0
-4, 25
-0, 46
0, 47
-5, 21
-4, 27
-12, 21
-7, 30
-4, 28
-7, 30
-7, 30
-5, 22
-4, 29
-7, 31
+4, 1
+0, 27
4, 30
-9, 0
-1, 1
-10, 21
-5, 23
-12, 21
-0, 47
-1, 0
-10, 23
-16, 18
-7, 1
-10, 24
-4, 30
7, 30
-4, 30
-5, 21
-1, 2
-4, 31
-5, 24
-5, 0
-16, 20
-4, 32
-7, 32
-1, 0
-5, 25
+0, 3
+1, 12
+1, 23
+0, 34
+1, 30
19, 12
-7, 34
-12, 0
-1, 1
-5, 28
-12, 22
-4, 34
-12, 23
-7, 31
-5, 29
-5, 30
5, 31
-30, 1
-7, 34
-10, 25
-12, 24
-7, 34
+36, 0
+34, 0
+8, 0
+10, 9
+20, 31
+25, 31
+0, 2
+30, 34
1, 0
-4, 34
+0, 2
+28, 0
+0, 31
+4, 21
+7, 30
+22, 31
+4, 15
+2, 1
+19, 30
+7, 0
+10, 1
+4, 8
+5, 13
+0, 24
7, 34
-1, 0
-4, 34
-4, 34
-2, 0
-4, 38
-25, 2
-7, 38
-4, 46
-1, 0
-1, 0
-7, 46
+10, 31
+5, 20
7, 47
-1, 0
-7, 46
-1, 3
-22, 0
+0, 1
+0, 7
+0, 1
+4, 0
+0, 22
+0, 30
+10, 22
0, 0
-16, 21
-4, 47
-1, 6
-1, 2
-5, 32
-19, 18
-7, 31
-1, 12
+5, 6
+7, 20
4, 46
-16, 22
-2, 0
+22, 0
+0, 32
+5, 1
+0, 8
+7, 1
+10, 2
+16, 12
+0, 2
+4, 2
16, 23
-19, 20
-2, 0
-1, 20
-4, 47
-9, 0
-1, 21
-16, 24
-5, 34
-5, 30
-22, 0
-16, 25
-16, 28
-33, 0
-1, 1
-2, 0
-22, 0
-2, 0
-10, 28
-12, 25
-5, 34
-7, 31
+0, 0
+7, 18
+12, 6
+4, 1
+5, 16
+0, 1
+0, 30
+19, 1
+12, 3
+16, 3
+0, 0
+7, 2
+0, 6
+0, 12
+4, 2
+7, 0
+10, 3
+0, 25
+4, 0
4, 31
-5, 46
-19, 21
-10, 30
-7, 47
-25, 12
-25, 1
-10, 30
-12, 28
-2, 1
-1, 22
9, 0
-1, 23
-19, 22
-5, 34
-10, 31
-16, 30
-5, 47
-1, 25
-5, 31
-7, 31
-10, 31
-10, 32
-1, 28
-30, 1
-4, 31
-9, 0
-2, 0
-19, 23
-12, 30
-1, 30
-27, 1
-22, 1
-4, 31
-5, 30
-1, 31
-22, 20
-1, 32
-4, 31
-6, 0
-16, 30
+0, 2
2, 2
-1, 34
-25, 20
-2, 3
-10, 31
-6, 0
-1, 34
+4, 3
+7, 0
+25, 21
+10, 15
+16, 22
+5, 6
+7, 15
+10, 0
+16, 1
+19, 0
+0, 1
+5, 1
+0, 2
+20, 0
+12, 0
+27, 34
+12, 0
12, 31
-37, 0
-22, 21
-1, 34
-1, 46
22, 0
-6, 0
-27, 0
-22, 22
-19, 30
-6, 1
-7, 31
-1, 31
-2, 1
-25, 21
-1, 47
-30, 2
-6, 0
-1, 30
-6, 2
-19, 0
-6, 30
+25, 30
+7, 20
+30, 0
+0, 2
+5, 1
+7, 27
+16, 31
+5, 1
+0, 2
+12, 1
+16, 31
+0, 2
+2, 31
+10, 0
+0, 3
6, 31
-19, 1
-2, 30
-8, 0
+7, 2
+19, 34
+5, 1
10, 34
-9, 0
2, 31
-19, 31
-9, 1
+7, 6
+4, 0
+0, 2
+10, 1
10, 34
-16, 31
+2, 30
+4, 0
+23, 1
+10, 20
+22, 30
+0, 2
+7, 0
+4, 0
19, 31
-10, 31
-8, 0
-10, 46
-12, 31
-16, 31
-6, 31
-19, 34
-16, 34
-22, 30
-16, 47
+0, 1
+0, 3
+0, 23
+2, 0
+0, 0
+0, 10
+0, 8
+4, 38
+10, 0
+0, 12
+1, 1
+5, 28
+0, 10
+5, 30
1, 31
-25, 30
-33, 0
-12, 34
-27, 30
-10, 47
-19, 47
-8, 0
-2, 31
+33, 31
2, 34
-22, 31
-9, 30
-6, 34
-11, 0
-30, 30
-13, 0
-38, 0
-22, 31
-13, 1
-11, 0
-11, 1
-25, 31
-25, 31
-13, 0
-22, 34
-25, 34
+0, 13
+20, 34
+4, 2
26, 0
30, 31
-20, 0
-23, 0
-30, 34
-27, 31
-20, 0
-27, 34
-5, 31
-23, 1
-23, 31
-30, 0
-8, 31
-20, 31
+0, 43
+25, 34
37, 31
-13, 31
-23, 34
-8, 34
-11, 31
-20, 34
-26, 31
-33, 31
-28, 0
-14, 0
-31, 0
-34, 0
-38, 31
-28, 31
-36, 0
-32, 0
-39, 0
+10, 2
+13, 1
+4, 0
+0, 15
+9, 0
+22, 20
+27, 0
+10, 12
+12, 13
+33, 0
+1, 21
+7, 0
+30, 2
+19, 20
+4, 6
+16, 2
+0, 18
+0, 28
+4, 3
+7, 0
+10, 1
+0, 3
+4, 9
+0, 27
+0, 31
+4, 18
+0, 31
+6, 30
+13, 0
+9, 30
+11, 0
+10, 31
+6, 0
+1, 34
+19, 22
+0, 31
+10, 6
+4, 10
+7, 46
+16, 21
+7, 22
+12, 22
+7, 0
+6, 31
+8, 0
+10, 31
+2, 0
+5, 21
+10, 23
+1, 2
+7, 0
+5, 1
+7, 16
+0, 1
+4, 0
+6, 1
+0, 15
+10, 0
+5, 6
+0, 22
+7, 20
+0, 2
+19, 31
+0, 1
+22, 0
+2, 0
+25, 12
+12, 23
+0, 1
+0, 1
+10, 28
+4, 12
+7, 24
+5, 32
+12, 30
+0, 2
+0, 1
+16, 15
+5, 7
+0, 1
+0, 2
+22, 1
+0, 1
+10, 1
+0, 2
+4, 1
+16, 34
+19, 18
+7, 34
+0, 20
+7, 21
+0, 0
+12, 3
+4, 13
+19, 3
+16, 30
+25, 1
+4, 0
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/data/itc2007/examination/output/exam_comp_set3_ge0ffrey.sln
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/data/itc2007/examination/output/exam_comp_set3_ge0ffrey.sln 2008-01-08 16:12:50 UTC (rev 17633)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/data/itc2007/examination/output/exam_comp_set3_ge0ffrey.sln 2008-01-08 19:22:16 UTC (rev 17634)
@@ -1,934 +1,934 @@
+21, 6
+0, 42
+34, 37
+8, 37
+4, 9
+4, 0
+0, 37
+0, 14
+30, 37
+15, 21
+1, 10
+25, 37
+9, 37
+13, 37
+5, 21
+29, 37
+1, 12
+5, 9
+15, 10
+9, 37
+1, 21
+5, 9
+9, 19
+13, 37
+22, 9
+7, 9
+12, 37
+12, 42
+33, 9
+25, 10
+13, 9
+1, 9
+5, 37
+4, 31
+21, 9
+4, 37
+30, 10
+9, 9
+8, 3
+16, 9
+21, 9
+0, 15
+4, 7
+8, 5
+12, 4
+16, 5
+29, 9
+26, 9
+9, 37
+5, 37
+0, 35
+18, 9
+12, 9
+8, 9
+0, 37
+4, 4
+11, 37
+22, 9
+26, 10
+4, 10
+21, 42
+8, 10
0, 0
0, 0
+0, 4
+21, 9
+8, 31
+17, 9
0, 0
+4, 12
+0, 37
+4, 21
+13, 10
+8, 9
+0, 5
+4, 0
+0, 37
+16, 37
+0, 31
+12, 37
+21, 37
+8, 35
+2, 9
+18, 37
+8, 37
+22, 37
+4, 10
+11, 9
+26, 37
+8, 10
+33, 8
+0, 3
+4, 1
+35, 10
+16, 3
+0, 9
+21, 8
+29, 0
+27, 10
+26, 10
+0, 12
+8, 1
+12, 10
+22, 10
+0, 44
+25, 10
+16, 9
+8, 12
+8, 4
+12, 0
+4, 1
+0, 6
+4, 0
+0, 3
+12, 9
0, 0
-0, 0
-0, 0
+4, 5
+0, 24
+12, 15
+4, 9
+4, 0
+25, 0
+34, 1
+21, 5
+0, 9
0, 1
-0, 2
-0, 0
-0, 0
+8, 10
+29, 10
+0, 6
+17, 5
+0, 5
+16, 0
4, 0
-8, 0
+0, 37
0, 0
+0, 3
+4, 3
+4, 31
+16, 9
12, 0
+8, 0
+0, 1
+4, 1
+8, 0
+0, 31
+12, 24
+8, 15
+4, 9
+0, 37
+7, 0
+16, 37
+11, 0
+15, 9
+18, 10
+1, 0
0, 0
+21, 37
+33, 10
+5, 9
+5, 0
+15, 9
+12, 10
+0, 8
+24, 0
+16, 37
+4, 21
+0, 10
+0, 10
+12, 14
+8, 9
+0, 37
+28, 0
+0, 4
+25, 37
+4, 9
+30, 21
+13, 9
+33, 12
0, 0
+0, 9
+4, 37
+0, 10
+9, 31
+13, 37
+30, 9
+9, 37
+34, 9
0, 3
+33, 9
+4, 3
+17, 3
+21, 14
+15, 37
+25, 42
+17, 9
+0, 21
+30, 4
+0, 37
+12, 1
+4, 5
+8, 4
+0, 9
+18, 0
+26, 0
+8, 9
+22, 0
+0, 1
0, 0
-4, 0
0, 0
+8, 21
+34, 9
4, 0
+35, 21
+8, 12
+13, 37
+29, 37
+31, 9
+21, 1
+0, 10
+29, 1
+29, 1
+4, 0
+25, 2
0, 0
+15, 1
+30, 3
+23, 3
+4, 6
+18, 5
+15, 1
+33, 5
+9, 1
+9, 1
0, 0
-0, 0
-0, 0
-0, 0
+0, 2
4, 0
-8, 1
+27, 0
+15, 0
+0, 1
0, 0
+0, 1
+0, 2
+21, 0
+9, 0
+0, 2
+0, 1
+9, 0
+9, 0
0, 0
0, 0
-0, 0
-0, 0
+16, 0
4, 0
-0, 3
-0, 3
+8, 0
0, 0
+12, 0
+5, 10
+9, 10
+0, 12
+16, 9
+4, 9
+8, 37
+25, 37
+12, 35
+13, 1
+4, 9
+0, 6
+25, 37
+12, 12
+21, 31
+0, 5
0, 0
+8, 8
+0, 12
+17, 6
+35, 9
+5, 3
+12, 37
+34, 9
+29, 37
+25, 31
+12, 3
+15, 9
+29, 37
+1, 10
+21, 37
+9, 21
+4, 37
+25, 37
+21, 37
+12, 37
+0, 10
+4, 9
+29, 8
+16, 31
+34, 9
+25, 9
+8, 24
+0, 10
+0, 5
+8, 7
+12, 3
+4, 3
0, 0
-4, 1
0, 0
-0, 0
0, 3
+12, 0
+4, 0
0, 3
+12, 1
+4, 0
0, 0
+4, 0
+8, 3
0, 0
0, 0
-0, 4
+16, 3
0, 0
-0, 4
+22, 0
+25, 4
+17, 4
+16, 4
+4, 3
+8, 0
+21, 21
+12, 37
+16, 21
+0, 9
0, 0
-0, 2
-0, 1
-9, 0
-16, 0
+21, 15
+12, 9
4, 0
+16, 42
+0, 12
+4, 37
+4, 0
+8, 31
+12, 0
+29, 3
+35, 12
+33, 3
+23, 9
+12, 0
+21, 3
0, 0
-8, 0
+4, 0
+21, 37
+0, 37
+29, 21
+5, 4
+9, 10
+4, 42
+25, 9
+4, 15
+12, 12
+0, 24
+1, 3
+23, 0
+18, 3
+0, 37
0, 0
+0, 8
+25, 37
+25, 0
+12, 31
+25, 9
+24, 37
0, 0
-0, 0
+10, 0
+29, 9
8, 0
+8, 0
0, 0
0, 0
+4, 37
+16, 21
+16, 9
+4, 9
+8, 6
+25, 8
+0, 37
0, 0
-0, 4
-0, 4
-12, 1
+12, 8
+29, 9
+29, 6
+0, 7
+21, 9
0, 0
+8, 9
+21, 9
0, 0
4, 0
-0, 0
-0, 0
-0, 0
-0, 3
-0, 3
-0, 3
-0, 3
-0, 1
-0, 3
+8, 1
+0, 37
+0, 8
+16, 15
+0, 5
4, 0
8, 0
+0, 21
+8, 14
+4, 9
+18, 0
+0, 21
+12, 12
+29, 9
+0, 21
+0, 5
+12, 9
+18, 9
+1, 4
+10, 9
+12, 37
0, 0
-4, 0
-0, 3
-0, 3
+9, 9
+22, 21
+16, 6
+16, 8
+24, 10
+3, 10
+17, 37
+26, 37
+25, 10
+21, 37
+21, 10
+4, 12
+0, 21
+16, 9
+4, 37
+34, 12
+33, 9
+13, 37
+12, 31
+29, 12
+25, 9
+0, 21
+8, 9
+17, 9
+0, 42
15, 0
+21, 0
+9, 0
+0, 1
+15, 0
+26, 9
+28, 9
+3, 9
+2, 21
+9, 9
+0, 9
+0, 9
+0, 5
+13, 10
+9, 5
+4, 6
+0, 37
+34, 37
+22, 9
+13, 21
0, 0
+0, 9
+16, 10
+34, 0
+31, 0
+17, 10
+0, 3
+30, 12
+0, 9
+1, 9
+4, 5
+4, 3
+0, 5
+8, 0
+30, 9
+12, 6
+12, 3
+0, 10
+8, 9
+4, 37
+12, 3
+4, 6
+0, 5
+0, 7
+4, 8
+8, 6
+8, 9
+8, 9
+8, 8
+0, 10
+7, 37
+35, 37
+33, 37
+29, 0
+13, 4
+25, 9
+14, 9
+0, 37
+21, 9
+4, 37
9, 0
+8, 21
+34, 4
+30, 5
+17, 1
+13, 0
+0, 10
+25, 0
+14, 0
+4, 9
+4, 9
+30, 1
+0, 10
+21, 6
+9, 4
+29, 2
+8, 9
+33, 2
9, 0
+25, 9
+0, 10
+8, 3
0, 0
-12, 0
+0, 21
0, 0
0, 0
0, 0
-0, 0
-0, 4
-4, 2
-0, 0
-0, 1
-4, 1
+12, 0
+4, 0
+8, 3
8, 0
+0, 5
0, 0
-4, 0
+4, 3
+16, 0
+0, 6
+21, 3
0, 0
-0, 0
-0, 0
-0, 3
-0, 5
-0, 3
-4, 2
-8, 0
4, 0
-0, 5
-0, 5
4, 0
-4, 0
-0, 5
-4, 0
-0, 5
-0, 5
-0, 5
-0, 5
-4, 0
-0, 5
-4, 0
-0, 5
-0, 5
-0, 5
-4, 0
-4, 0
-0, 5
-4, 0
-0, 1
-9, 1
-8, 0
+10, 37
+25, 12
+15, 9
+29, 37
+24, 9
+4, 37
+16, 6
+2, 37
+0, 0
+8, 42
+34, 9
+9, 37
+12, 37
0, 6
8, 0
-0, 6
-0, 6
-0, 6
-0, 4
-12, 2
-0, 4
4, 0
-0, 3
-0, 6
-0, 6
-21, 0
-0, 6
-0, 3
-0, 3
-0, 3
-4, 0
4, 1
-4, 0
-0, 3
-4, 3
-8, 0
-0, 6
-4, 3
-0, 7
-0, 7
-0, 7
-4, 3
-0, 3
-0, 8
-0, 8
-8, 2
-0, 8
-4, 3
-4, 3
-0, 8
-0, 9
-0, 9
-8, 0
-4, 1
-4, 1
-4, 2
-8, 0
-0, 8
-4, 3
-8, 0
-0, 4
-0, 8
-4, 3
-8, 0
+21, 28
+15, 37
+10, 10
+8, 37
+15, 37
+4, 8
+29, 9
0, 10
-0, 10
-4, 3
-0, 10
+8, 1
+2, 37
+4, 37
+30, 37
+35, 37
+1, 37
+12, 37
+30, 6
+4, 15
+26, 9
4, 4
-0, 10
-4, 1
-0, 4
12, 0
-0, 10
-0, 10
-0, 10
-0, 10
-4, 4
-8, 2
-4, 4
-8, 2
+20, 3
8, 0
-12, 1
-0, 1
-4, 1
-9, 1
-4, 5
+0, 0
+25, 6
+34, 5
+30, 9
+21, 9
+21, 9
+8, 9
8, 0
+0, 14
+9, 12
+0, 9
+35, 1
+0, 5
+0, 6
4, 11
-4, 4
-0, 10
-0, 10
-12, 1
-0, 9
-0, 4
-4, 4
-4, 4
-0, 1
-4, 6
-4, 6
-4, 6
+0, 0
+20, 1
+4, 0
+0, 0
+0, 37
+8, 9
+17, 9
+16, 5
+16, 4
+25, 3
+4, 0
+4, 9
8, 3
-8, 3
+12, 6
+0, 3
+23, 1
+1, 9
+0, 3
+14, 1
+12, 37
+29, 31
+32, 37
+6, 37
+33, 37
+14, 37
+14, 37
+31, 9
+9, 2
+6, 10
+21, 37
+27, 37
+0, 0
+4, 10
+11, 9
+20, 0
+18, 12
+17, 37
+33, 9
+25, 12
+23, 9
+3, 37
+4, 21
+19, 37
+31, 37
+8, 10
+13, 5
+26, 37
+18, 37
+28, 37
+30, 9
+0, 0
+20, 9
+15, 2
+5, 37
+2, 10
+1, 37
+16, 9
+24, 9
+0, 12
+10, 37
+4, 0
+4, 37
+0, 37
+16, 37
+30, 37
+0, 7
0, 10
+12, 37
+4, 37
0, 9
-12, 0
-4, 6
-4, 7
-0, 9
-16, 0
-0, 10
-0, 10
-0, 9
-15, 1
-0, 10
-12, 0
-12, 0
-0, 10
-4, 8
-0, 10
-8, 3
-0, 10
-8, 3
-12, 0
-0, 10
-4, 5
-8, 4
-21, 1
-8, 3
-4, 8
-12, 0
-8, 5
+21, 21
+30, 9
+16, 14
+29, 9
+8, 9
+4, 9
0, 12
-4, 8
-0, 13
-0, 12
-8, 4
-0, 9
-0, 12
-0, 12
-0, 12
4, 9
-8, 1
-12, 2
+8, 6
+35, 37
+0, 0
+35, 9
+32, 9
+0, 0
+26, 21
+4, 1
+5, 9
+31, 9
8, 5
+4, 4
4, 9
-8, 5
-16, 1
-8, 5
-4, 5
-4, 9
-8, 6
-8, 6
-4, 9
-12, 0
-0, 12
-0, 12
-4, 9
-8, 6
-16, 2
-8, 4
16, 0
-4, 9
+0, 10
+0, 31
+35, 0
+32, 9
+14, 9
+1, 37
+13, 12
+0, 0
+12, 2
+0, 14
0, 12
-21, 2
0, 4
-12, 3
-8, 7
-0, 1
-8, 8
-9, 0
-16, 0
-21, 3
-0, 14
-0, 14
-8, 4
-12, 1
-4, 5
-8, 8
-0, 15
-0, 18
-0, 9
-0, 20
-0, 14
-0, 21
-0, 2
+16, 9
+8, 5
+10, 21
+29, 21
+12, 8
+21, 37
4, 9
-8, 8
-9, 0
-0, 21
+0, 0
+0, 6
+21, 9
+0, 10
+12, 12
4, 9
-16, 3
-4, 10
-4, 22
-8, 23
+0, 10
+16, 4
8, 9
0, 9
-12, 1
+33, 9
+33, 6
+0, 0
+4, 4
+0, 0
+0, 0
+0, 3
+0, 3
+0, 5
4, 9
-12, 3
-0, 24
-0, 21
-15, 0
-4, 9
-0, 9
+4, 3
+0, 5
+4, 10
+12, 10
+0, 0
+0, 10
+8, 9
+12, 21
+21, 12
+16, 9
+0, 3
+0, 8
+0, 0
+0, 3
+0, 3
+28, 37
+26, 12
+27, 9
+24, 9
+29, 0
8, 10
-25, 0
-21, 4
-12, 4
-8, 25
-0, 15
-12, 4
-4, 9
-15, 1
-0, 21
-18, 0
-12, 3
-12, 3
+18, 1
+21, 5
+34, 0
+28, 10
+0, 3
+30, 0
+9, 3
+33, 0
+17, 0
+26, 1
+8, 2
+16, 3
4, 10
-16, 3
-21, 4
-16, 26
-4, 27
0, 9
-4, 9
-4, 9
-16, 3
-0, 21
-4, 12
-8, 9
-8, 9
-4, 9
-4, 9
-8, 10
+29, 3
+25, 3
+30, 0
+17, 0
12, 5
+9, 3
+29, 0
+33, 0
+4, 4
+20, 0
+20, 10
+0, 9
+8, 4
8, 10
-0, 9
-8, 9
-12, 6
-0, 9
-4, 10
-29, 0
+0, 0
+25, 10
+21, 10
+16, 3
+12, 1
+35, 3
+4, 1
21, 4
25, 1
+12, 5
+0, 3
+8, 2
+12, 1
+16, 2
+4, 1
+0, 3
+9, 6
+13, 3
+8, 5
+21, 4
+8, 4
+0, 6
+0, 8
+4, 5
+0, 0
+0, 0
+10, 9
+4, 14
+0, 9
+13, 9
+16, 9
+35, 10
16, 0
-8, 9
-0, 21
-16, 0
-8, 9
-0, 9
-21, 3
-0, 15
-4, 10
-12, 29
-16, 3
-25, 2
-21, 5
-12, 5
-4, 30
-4, 10
-8, 1
-21, 5
-0, 21
-13, 0
-9, 2
-12, 4
+12, 0
4, 9
-0, 31
-0, 31
-4, 9
21, 3
-12, 6
-0, 9
-29, 0
-33, 0
-33, 0
-12, 5
-25, 1
-8, 10
-0, 24
-4, 9
-16, 4
-12, 8
-8, 9
-12, 9
-4, 9
-16, 4
-16, 4
-9, 3
-17, 0
-0, 32
-18, 0
-8, 9
-0, 31
-12, 8
-4, 10
-21, 6
-16, 5
-12, 10
+34, 0
+0, 12
+8, 0
+0, 8
+8, 8
25, 0
+4, 3
+0, 4
+31, 10
+29, 10
+30, 8
+34, 10
+16, 10
0, 37
-4, 9
-16, 6
-16, 5
+12, 1
+16, 1
+8, 2
+12, 2
+4, 2
+0, 4
+8, 0
+21, 2
+8, 0
17, 0
-9, 1
-0, 37
-0, 37
-22, 0
-29, 1
-16, 6
-0, 9
-17, 1
-17, 0
-21, 8
-4, 9
-30, 0
-30, 0
-4, 14
-0, 37
-0, 37
-0, 37
-21, 6
-4, 15
+0, 4
+4, 2
+25, 1
+4, 10
+12, 5
+0, 4
33, 1
-8, 9
-26, 0
-4, 15
-16, 8
-34, 0
-4, 10
-8, 9
+0, 4
+21, 4
+4, 2
+0, 4
+12, 37
+4, 8
+4, 0
+4, 6
21, 9
-12, 12
-26, 1
-0, 37
+19, 9
+22, 37
+23, 37
+18, 0
+25, 5
12, 9
-12, 12
-0, 37
-8, 9
-4, 21
-18, 1
-34, 0
+6, 0
+30, 5
0, 39
-22, 1
-0, 37
-4, 21
-12, 12
-0, 37
-25, 0
-9, 3
-21, 10
-0, 9
-0, 37
-4, 21
-16, 9
-4, 21
-8, 12
-13, 1
-29, 2
-33, 2
-29, 3
-25, 3
-12, 12
-9, 4
-20, 0
-16, 9
-4, 24
-29, 0
-12, 14
-25, 4
-21, 9
-8, 9
-13, 0
-0, 37
-4, 31
-29, 1
-21, 9
-30, 1
-21, 9
-0, 37
-8, 9
-17, 3
-30, 3
-25, 3
-8, 10
-26, 3
-4, 31
-8, 10
-12, 15
-16, 9
-30, 4
-16, 10
-4, 37
-30, 5
-8, 9
-8, 9
-21, 12
-4, 37
-16, 9
-16, 9
-34, 0
-30, 3
-8, 14
-4, 37
-12, 10
-12, 9
-29, 4
-25, 4
-0, 42
-8, 10
-8, 15
-29, 3
-8, 21
-16, 9
-21, 9
-30, 5
29, 5
-12, 21
-8, 21
-34, 1
-12, 24
-8, 21
-8, 24
-8, 31
-12, 31
-18, 0
+23, 10
21, 0
-21, 10
-33, 3
-12, 31
-25, 5
33, 4
+29, 4
+12, 4
+0, 1
+0, 15
+16, 0
+0, 15
+12, 4
+25, 46
+8, 25
+0, 13
+4, 10
+0, 3
+0, 32
+16, 26
+4, 22
+8, 23
+12, 29
+4, 27
+0, 18
8, 37
-0, 44
-4, 37
-0, 37
-25, 6
-6, 0
-4, 37
+29, 9
+20, 9
4, 10
-12, 37
-18, 3
-25, 8
-25, 9
-12, 10
+0, 9
+0, 9
+0, 3
+14, 10
+7, 10
+17, 37
+6, 9
+20, 21
0, 37
-33, 5
25, 9
-23, 0
-12, 37
-4, 37
+13, 0
+4, 21
+0, 0
+27, 9
+5, 12
+12, 21
+0, 4
+16, 12
+25, 21
21, 12
-29, 6
-21, 10
-0, 37
-18, 4
-16, 9
-12, 37
-25, 46
34, 3
-12, 37
-4, 37
+29, 37
+30, 10
+0, 10
+0, 9
+8, 10
+25, 9
21, 10
-25, 9
-12, 21
-16, 9
-0, 37
-29, 8
-29, 9
4, 37
-4, 37
-16, 12
-8, 31
-17, 4
-4, 37
-8, 37
-21, 9
-29, 10
-0, 37
-34, 4
-30, 6
-25, 10
-21, 9
-12, 37
-9, 0
-16, 9
-13, 3
-30, 8
-16, 10
-21, 9
-16, 9
-0, 42
-29, 9
-15, 0
-21, 0
-21, 9
-34, 5
-33, 6
-21, 9
-25, 10
-25, 10
-16, 14
-25, 9
-13, 4
-8, 42
-13, 5
-33, 8
-21, 14
-21, 15
-25, 9
-30, 9
+18, 4
+4, 9
+30, 3
+26, 3
+4, 9
+9, 1
+22, 1
0, 9
-16, 15
-12, 37
-16, 21
-0, 9
-29, 9
-25, 9
-30, 9
-12, 37
-17, 5
-16, 21
-9, 5
-12, 9
-33, 9
-17, 6
-14, 0
-4, 37
-21, 21
-21, 21
-4, 42
-35, 0
-8, 37
-29, 9
-25, 9
-25, 9
-35, 1
-25, 12
-9, 6
-21, 31
-29, 9
-25, 12
-8, 12
-9, 9
-1, 0
-16, 31
-20, 1
-20, 0
-5, 0
-12, 37
-21, 37
-4, 37
-4, 37
-21, 37
-1, 3
-21, 37
-17, 9
-21, 37
-13, 9
-33, 9
-17, 9
-18, 5
-34, 9
-25, 10
-5, 3
-13, 10
-31, 0
-29, 9
+25, 4
+0, 3
12, 10
-23, 3
-25, 21
-0, 35
-16, 37
-25, 31
-17, 10
-12, 37
-5, 4
+21, 10
+4, 30
+0, 20
9, 10
-25, 37
-1, 4
-13, 12
-22, 0
-29, 9
-34, 10
-30, 10
-24, 0
-12, 37
-9, 10
-20, 3
-12, 37
-8, 35
-29, 12
-29, 21
-21, 42
-12, 42
-13, 10
-16, 37
-29, 21
-29, 31
-30, 10
-18, 9
-25, 42
-12, 35
-13, 9
-5, 9
-35, 3
-16, 37
-21, 37
-21, 37
-27, 0
-30, 9
-25, 37
-33, 9
-9, 9
-20, 9
-34, 9
-33, 9
-25, 37
-29, 37
-33, 9
-29, 37
-9, 10
-34, 9
-29, 37
-8, 37
-22, 9
-7, 0
-11, 0
-9, 12
-18, 10
-16, 42
-12, 9
-1, 9
-15, 9
-9, 21
-30, 12
-26, 9
-33, 10
-28, 0
-21, 37
-26, 9
-1, 10
-13, 21
-10, 0
-30, 9
-29, 10
-9, 31
-15, 9
-26, 10
-35, 9
-8, 37
-10, 9
-5, 9
-22, 10
-30, 9
-35, 10
-35, 10
-31, 9
-26, 12
-26, 10
-15, 9
-13, 37
-20, 10
-25, 37
-1, 12
-33, 12
-9, 37
-15, 9
-29, 37
-13, 37
-29, 37
-34, 9
-18, 12
-4, 12
-9, 37
-27, 9
-5, 9
-15, 10
-9, 37
-17, 9
-21, 37
-5, 10
-24, 9
-34, 9
-1, 21
-5, 9
-9, 19
-13, 37
-22, 9
-23, 9
-5, 12
-24, 9
-29, 37
-13, 9
-35, 12
-1, 10
-5, 21
-9, 37
-13, 37
-30, 21
-4, 0
-27, 9
-1, 37
-1, 9
-5, 37
-26, 9
-7, 9
-25, 37
-26, 21
-13, 37
-31, 9
-9, 37
-35, 21
-31, 10
-17, 9
20, 12
-9, 9
-1, 9
-32, 9
-14, 9
-27, 10
-34, 12
-20, 21
+8, 21
+4, 24
+0, 4
+4, 4
0, 0
-5, 37
-2, 9
-10, 10
-14, 10
-22, 21
-11, 9
-2, 10
-15, 21
-4, 0
-10, 21
-2, 21
-25, 37
-22, 9
-26, 37
-30, 37
-17, 37
-10, 9
-3, 9
-32, 9
-15, 37
-14, 9
-6, 9
-3, 10
-31, 9
-14, 37
-18, 37
-1, 37
-34, 37
-34, 37
-6, 10
-15, 37
-30, 37
-35, 37
-1, 37
-20, 9
-28, 9
-28, 10
-15, 37
-24, 9
-2, 37
-4, 0
-2, 37
-0, 0
-35, 9
-35, 37
-28, 37
-10, 37
-5, 37
-10, 37
-22, 37
-21, 28
-16, 37
-11, 9
-26, 37
-23, 9
-23, 10
-24, 10
-19, 9
-23, 37
-7, 10
-35, 37
-22, 37
-6, 37
-18, 9
-29, 0
-17, 37
-7, 37
-33, 37
-17, 37
-11, 37
-32, 37
-30, 37
-27, 37
-28, 37
-26, 37
-33, 37
-24, 37
-3, 37
-18, 37
-19, 37
-31, 37
-25, 0
-14, 37
-23, 1
-14, 1
-15, 2
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/data/itc2007/examination/output/exam_comp_set4_ge0ffrey.sln
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/data/itc2007/examination/output/exam_comp_set4_ge0ffrey.sln 2008-01-08 16:12:50 UTC (rev 17633)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/data/itc2007/examination/output/exam_comp_set4_ge0ffrey.sln 2008-01-08 19:22:16 UTC (rev 17634)
@@ -1,273 +1,273 @@
+9, 0
0, 0
+15, 0
+4, 0
0, 0
+3, 0
+15, 0
+3, 0
+12, 0
+9, 0
+18, 0
+13, 0
0, 0
+11, 0
+9, 0
+7, 0
+6, 0
+11, 0
+10, 0
+12, 0
+3, 0
+9, 0
0, 0
+6, 0
0, 0
+5, 0
+3, 0
+3, 0
+4, 0
+19, 0
+11, 0
+20, 0
+7, 0
+4, 0
+13, 0
+10, 0
+6, 0
+6, 0
+9, 0
+3, 0
+12, 0
0, 0
+10, 0
0, 0
0, 0
+12, 0
+6, 0
0, 0
+6, 0
+15, 0
+3, 0
0, 0
+18, 0
+12, 0
0, 0
-0, 0
-0, 0
-0, 0
-0, 0
-0, 0
-0, 0
+8, 0
+4, 0
+13, 0
+17, 0
+7, 0
+10, 0
3, 0
+19, 0
+12, 0
+5, 0
+10, 0
0, 0
-3, 0
0, 0
0, 0
+19, 0
+12, 0
+9, 0
+6, 0
0, 0
+14, 0
0, 0
-0, 0
+17, 0
+16, 0
+20, 0
+13, 0
+12, 0
3, 0
3, 0
-0, 0
+6, 0
+2, 0
+9, 0
3, 0
+14, 0
+9, 0
+11, 0
+6, 0
0, 0
3, 0
+9, 0
+18, 0
+18, 0
3, 0
+0, 0
3, 0
+10, 0
+18, 0
+9, 0
0, 0
+18, 0
+19, 0
+16, 0
+0, 0
+16, 0
3, 0
3, 0
+1, 0
+4, 0
+12, 0
0, 0
+17, 0
+1, 0
+16, 0
+18, 0
+16, 0
+15, 0
+15, 0
+5, 0
+1, 0
+1, 0
+13, 0
+12, 0
+8, 0
+9, 0
+9, 0
+6, 0
+4, 0
+9, 0
0, 0
0, 0
0, 0
6, 0
0, 0
+0, 0
+8, 0
+19, 0
+19, 0
+20, 0
+0, 0
+0, 0
+0, 0
+3, 0
+13, 0
+3, 0
+0, 0
6, 0
9, 0
-6, 0
+12, 0
9, 0
-6, 0
+15, 0
3, 0
+13, 0
+16, 0
0, 0
+18, 0
+1, 0
+2, 0
+2, 0
0, 0
-3, 0
+7, 0
+11, 0
+4, 0
+2, 0
+15, 0
6, 0
3, 0
+14, 0
+8, 0
6, 0
+9, 0
3, 0
-6, 0
-3, 0
0, 0
+15, 0
+17, 0
+12, 0
+20, 0
+13, 0
+20, 0
+20, 0
+0, 0
9, 0
+5, 0
0, 0
+3, 0
+17, 0
0, 0
-6, 0
+18, 0
3, 0
3, 0
+6, 0
+6, 0
+5, 0
3, 0
-0, 0
-12, 0
-9, 0
-12, 0
3, 0
-3, 0
-9, 0
6, 0
+19, 0
+5, 0
6, 0
-15, 0
+16, 0
+6, 0
+9, 0
0, 0
6, 0
+0, 0
3, 0
0, 0
6, 0
+15, 0
+15, 0
0, 0
-9, 0
-9, 0
-12, 0
-9, 0
0, 0
-6, 0
-12, 0
15, 0
-9, 0
-0, 0
3, 0
9, 0
-9, 0
3, 0
+15, 0
6, 0
-9, 0
3, 0
-12, 0
0, 0
-12, 0
-15, 0
-18, 0
-12, 0
-15, 0
-15, 0
-18, 0
-6, 0
-15, 0
-6, 0
-6, 0
-3, 0
-15, 0
-3, 0
+8, 0
9, 0
-4, 0
-18, 0
-18, 0
-12, 0
+0, 0
+0, 0
9, 0
0, 0
+4, 0
13, 0
-13, 0
-3, 0
-16, 0
-1, 0
-3, 0
0, 0
-6, 0
0, 0
-12, 0
-6, 0
-18, 0
-15, 0
-15, 0
-0, 0
-6, 0
-6, 0
-12, 0
-18, 0
+17, 0
+14, 0
7, 0
-3, 0
9, 0
+11, 0
0, 0
-9, 0
+0, 0
+10, 0
+0, 0
3, 0
-6, 0
+15, 0
13, 0
+12, 0
+9, 0
6, 0
-12, 0
-0, 0
+6, 0
15, 0
3, 0
+3, 0
+9, 0
6, 0
0, 0
+6, 0
12, 0
-13, 0
-19, 0
-15, 0
0, 0
-3, 0
-9, 0
-9, 0
-18, 0
-20, 0
-15, 0
-19, 0
-9, 0
-10, 0
-4, 0
-12, 0
0, 0
-12, 0
-16, 0
-2, 0
0, 0
-12, 0
-20, 0
-6, 0
-19, 0
-11, 0
-10, 0
-18, 0
-10, 0
-13, 0
3, 0
-7, 0
-9, 0
-16, 0
-13, 0
-2, 0
-14, 0
-11, 0
-3, 0
17, 0
3, 0
-1, 0
-13, 0
-8, 0
+6, 0
+12, 0
15, 0
-19, 0
6, 0
+12, 0
3, 0
-19, 0
-5, 0
-16, 0
-9, 0
-1, 0
-16, 0
-4, 0
-17, 0
-0, 0
-4, 0
-4, 0
-11, 0
-12, 0
-6, 0
-8, 0
-15, 0
-17, 0
-20, 0
-7, 0
-19, 0
-10, 0
18, 0
-16, 0
6, 0
-6, 0
-14, 0
-14, 0
-10, 0
-20, 0
-9, 0
-7, 0
-5, 0
-13, 0
-4, 0
-9, 0
-17, 0
-11, 0
-8, 0
-2, 0
-15, 0
0, 0
-11, 0
-8, 0
-9, 0
-4, 0
-20, 0
-1, 0
-19, 0
0, 0
-14, 0
-10, 0
-10, 0
-4, 0
-11, 0
-13, 0
-5, 0
-2, 0
-8, 0
-17, 0
-20, 0
-1, 0
-18, 0
-16, 0
-5, 0
-7, 0
-5, 0
-17, 0
-17, 0
-5, 0
-13, 0
Added: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/common/domain/PersistableIdComparator.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/common/domain/PersistableIdComparator.java (rev 0)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/common/domain/PersistableIdComparator.java 2008-01-08 19:22:16 UTC (rev 17634)
@@ -0,0 +1,16 @@
+package org.drools.solver.examples.common.domain;
+
+import java.util.Comparator;
+
+import org.apache.commons.lang.builder.CompareToBuilder;
+
+/**
+ * @author Geoffrey De Smet
+ */
+public class PersistableIdComparator implements Comparator<AbstractPersistable> {
+
+ public int compare(AbstractPersistable a, AbstractPersistable b) {
+ return new CompareToBuilder().append(a.getId(), b.getId()).toComparison();
+ }
+
+}
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/persistence/ExaminationInputConvertor.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/persistence/ExaminationInputConvertor.java 2008-01-08 16:12:50 UTC (rev 17633)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/persistence/ExaminationInputConvertor.java 2008-01-08 19:22:16 UTC (rev 17634)
@@ -23,6 +23,7 @@
import org.drools.solver.config.XmlSolverConfigurer;
import org.drools.solver.core.evaluation.EvaluationHandler;
import org.drools.solver.examples.common.app.LoggingMain;
+import org.drools.solver.examples.common.domain.PersistableIdComparator;
import org.drools.solver.examples.common.persistence.XstreamSolutionDaoImpl;
import org.drools.solver.examples.itc2007.examination.app.ExaminationApp;
import org.drools.solver.examples.itc2007.examination.domain.Exam;
@@ -424,6 +425,7 @@
workingMemory.update(examHandle, exam);
}
}
+ Collections.sort(examList, new PersistableIdComparator());
}
private void createExamListNoRuleEngine(Examination examination) {
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/persistence/ExaminationOutputConvertor.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/persistence/ExaminationOutputConvertor.java 2008-01-08 16:12:50 UTC (rev 17633)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/persistence/ExaminationOutputConvertor.java 2008-01-08 19:22:16 UTC (rev 17634)
@@ -4,9 +4,11 @@
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
+import java.util.Collections;
import org.apache.commons.io.IOUtils;
import org.drools.solver.examples.common.app.LoggingMain;
+import org.drools.solver.examples.common.domain.PersistableIdComparator;
import org.drools.solver.examples.common.persistence.XstreamSolutionDaoImpl;
import org.drools.solver.examples.itc2007.examination.domain.Exam;
import org.drools.solver.examples.itc2007.examination.domain.Examination;
@@ -58,6 +60,7 @@
}
private void writeExamination(Examination examination, BufferedWriter bufferedWriter) throws IOException {
+ Collections.sort(examination.getExamList(), new PersistableIdComparator()); // TODO remove me when obsolete
for (Exam exam : examination.getExamList()) {
bufferedWriter.write(exam.getPeriod().getId() + ", " + exam.getRoom().getId() + "\r\n");
}
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/solver/examinationScoreRules.drl
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/solver/examinationScoreRules.drl 2008-01-08 16:12:50 UTC (rev 17633)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/solver/examinationScoreRules.drl 2008-01-08 19:22:16 UTC (rev 17634)
@@ -122,8 +122,8 @@
$leftSideTopic : leftSideTopic,
$rightSideTopic : rightSideTopic
)
- Exam(topic == $leftSideTopic, $leftSidePeriod : period);
- Exam(topic == $rightSideTopic, eval(period.getPeriodIndex() <= $leftSidePeriod.getPeriodIndex()));
+ Exam(topic == $leftSideTopic, $afterSidePeriod : period);
+ Exam(topic == $rightSideTopic, eval($afterSidePeriod.getPeriodIndex() <= period.getPeriodIndex()));
then
insertLogical(new IntConstraintOccurrence("periodHardConstraintAfter", ConstraintType.NEGATIVE_HARD,
$periodHardConstraint));
More information about the jboss-svn-commits
mailing list