Changeset 63 for anr/gantt.l

Timestamp:

Feb 2, 2010, 7:39:43 PM (14 years ago)

Author:

coach

Message:

MAJ TIMA sur tâche 5 et ressources s7

File:

• anr/gantt.l (modified) (3 diffs)

anr/gantt.l

@@ -658 +658 @@
                 an  += sum  ; tsk  += sum  ;
                 newlineadded=0;
-                if ( (sum1!=0 && sum1>last->nbma[0] ) || (sum1==0 && last->nbma[0]!=0) )
+                if ( sum1==0 && last->nbma[0]!=0) 
                     fprintf(stderr,"ERROR: %s:%s probleme sur l'an 1 (in table=%2.1f, in gantt=%2.1f\n",
                         part->name,label,sum1,last->nbma[0]);
-                if ( (sum2!=0 && sum2>last->nbma[1]) || (sum2==0 && last->nbma[1]!=0) )
+                if (sum1!=0 && sum1>last->nbma[0] ) 
+                    fprintf(stderr,"WARNING: %s:%s probleme sur l'an 1 (in table=%2.1f, in gantt=%2.1f\n",
+                        part->name,label,sum1,last->nbma[0]);
+                if (sum2!=0 && sum2>last->nbma[1]) 
+                    fprintf(stderr,"WARNING: %s:%s probleme sur l'an 2 (in table=%2.1f, in gantt=%2.1f\n",
+                        part->name,label,sum2,last->nbma[1]);
+                if ( sum2==0 && last->nbma[1]!=0) 
                     fprintf(stderr,"ERROR: %s:%s probleme sur l'an 2 (in table=%2.1f, in gantt=%2.1f\n",
                         part->name,label,sum2,last->nbma[1]);
-                if ( (sum3!=0 && sum3>last->nbma[2]) || (sum3==0 && last->nbma[2]!=0) )
+                if ( sum3==0 && last->nbma[2]!=0) 
                     fprintf(stderr,"ERROR: %s:%s probleme sur l'an 3 (in table=%2.1f, in gantt=%2.1f\n",
+                        part->name,label,sum3,last->nbma[2]);
+                if (sum3!=0 && sum3>last->nbma[2]) 
+                    fprintf(stderr,"WARNING: %s:%s probleme sur l'an 3 (in table=%2.1f, in gantt=%2.1f\n",
                         part->name,label,sum3,last->nbma[2]);
             }
@@ -724 +733 @@
                 char label[1000];
                 gen_label_base(label,last);
-                if ( (sum1!=0 && sum1>last->nbma[0] ) || (sum1==0 && last->nbma[0]!=0) )
+    /* doublons , non ?
+            if ( (sum1!=0 && sum1>last->nbma[0] ) || (sum1==0 && last->nbma[0]!=0) )
                     fprintf(stderr,"ERROR: %s:%s probleme sur l'an 1 (in table=%2.1f, in gantt=%2.1f\n",
                         part->name,label,sum1,last->nbma[0]);
@@ -733 +743 @@
                     fprintf(stderr,"ERROR: %s:%s probleme sur l'an 3 (in table=%2.1f, in gantt=%2.1f\n",
                         part->name,label,sum3,last->nbma[2]);
+*/
             }
         }