Changeset 300

Timestamp:

Dec 20, 2010, 2:20:29 AM (14 years ago)

Author:

coach

Message:

1) Ajout des parters entre () pour les sous taches.
2) Ajout des liens sur les livrables dans les taches.
3) Sorties d'un point csv
4) Regrouppement des livrables evaluation
5) Ajout du D840
6) MAJ des effort de l'UPMC

Location:

anr

Files:

• Makefile (modified) (2 diffs)
• anr.sty (modified) (3 diffs)
• gantt.l (modified) (13 diffs)
• section-project-task-schedule.tex (modified) (1 diff)
• task-backbone.tex (modified) (3 diffs)
• task-backend.tex (modified) (2 diffs)
• task-csg.tex (modified) (3 diffs)
• task-demonstrator.tex (modified) (1 diff)
• task-dissemination.tex (modified) (4 diffs)
• task-hpc.tex (modified) (2 diffs)

anr/Makefile

@@ -38 +38 @@
 
 anr.pdf: $(SOURCES) gantt
-        touch gantt1.tex gantt2.tex  $(TABLES)
+        mkdir -p tmp
+        touch gantt.tex gantt1.tex gantt2.tex  $(TABLES)
         @echo "Generating pdf file"
         @pdflatex anr.tex || true
@@ -53 +54 @@
 
 clean:
-        rm -f $(TABLES) anr.aux gantt1.tex gantt2.tex anr.pdf anr.gantt
+        rm -f $(TABLES) anr.aux gantt.tex gantt1.tex gantt2.tex anr.pdf anr.gantt

anr/anr.sty

@@ -142 +142 @@
     \global\advance\subtaskcnt1
     \def\subtaskname{S\taskname-\the\subtaskcnt}%
-    \item[\subtaskname: ##1]\mbox{}\\}}
-{\end{description}}
+    \item[\subtaskname: ##1]%
+    \IfFileExists{tmp/st\the\taskcnt-\the\subtaskcnt-partner.tex}%
+      {(\input{tmp/st\the\taskcnt-\the\subtaskcnt-partner.tex})}%
+      {\message{SKIPPING tmp/st\the\taskcnt-\the\subtaskcnt-partner.tex files}}%
+  \mbox{}\\%
+  {%
+    \let\xcoach\relax%
+    \let\xcoachplus\relax%
+    \let\irisa\relax    \let\Sirisa\relax%
+    \let\lip\relax      \let\Slip\relax%
+    \let\tima\relax     \let\Stima\relax%
+    \let\ubs\relax      \let\Subs\relax%
+    \let\upmc\relax     \let\Supmc\relax%
+    \let\altera\relax   \let\Saltera\relax%
+    \let\bull\relax     \let\Sbull\relax%
+    \let\thales\relax   \let\Sthales\relax%
+    \let\mds\relax      \let\Smds\relax%
+    \let\xilinx\relax%
+    \immediate\write\ganttdata{%
+        STN=\the\taskcnt\space\the\subtaskcnt\space##1
+    }%
+ }}%
+}{%
+  \end{description}}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -192 +214 @@
     \def\vers{V\the\verscnt}
     \global\edef\name{D\the\taskcnt\the\subtaskcnt\the\livrablecnt-\vers}%
+    \hypertarget{\name}{}%
     \writeganttinfo{##1}{##2}{none}{##4}{##3}{##5}
     \\\hline
@@ -217 +240 @@
     \def\vers{VF}
     \global\edef\name{D\the\taskcnt\the\subtaskcnt\the\livrablecnt-\vers}%
+    \hypertarget{\name}{}%
+    \hypertarget{\expandafter\@@novers\name\eoa}{}%
     \writeganttinfo{##1}{##2}{##6}{##4}{##3}{##5}
     \\\hline

anr/gantt.l

@@ -40 +40 @@
     0
 };
+char* subtask_names[20][20];
+char* get_subtask_name(int tn, int stn)
+{
+    char* ret=subtask_names[tn][stn];
+    if (ret==0)  {
+        fprintf(stderr,"ERROR: no name found for st%d-%d sub-task.\n",tn,stn);
+        return "";
+    } else
+        return ret;
+}
+
 struct partner_def { char *key, *name, *fnfull, *fnshort; } partner_table[] = {
     { "UNKNOW" ,"relax"  ,0                             ,0                        },
@@ -242 +253 @@
         milestones[i] = atoi(yytext+3);
     }
+STN=.*   {
+        int nb,tn, stn;
+        char tmp[1000];
+        nb=sscanf(yytext+4,"%d%d%s",&tn,&stn,tmp);
+        if ( nb==3 && 0<=tn && tn<10 && 0<=stn && stn<10 ) {
+            char* p =strstr(yytext+4,tmp);
+            subtask_names[tn][stn]=strdup(p);
+        } else {
+            fprintf(stderr, "bad formated ST rule (ignored): %s.\n",yytext);
+        }
+}
 BM=[0-9]+ { bm=atoi(yytext+3); }
 EM=[0-9]+ { em=atoi(yytext+3); }
@@ -725 +747 @@
                 sum2 = lcurr->hman[1]; sum +=sum2;
                 sum3 = lcurr->hman[2]; sum +=sum3;
-                char label[1000],title[1000];
+                char label_lnk[1000],label[1000],title[1000];
                 gen_label_base(label,leader);
+                sprintf(label_lnk,"\\hyperlink{%s}{%s}",label,label);
                 sprintf(title,"\\resstablestyletitle{%s}",leader->title);
                 fprintf(curr->os,"%s & %s & %2.1f & %2.1f & %2.1f & %2.1f \\\\\\hline\n",
-                   label,title,sum1,sum2,sum3,sum);
+                   label_lnk,title,sum1,sum2,sum3,sum);
                 an1 += sum1 ; tsk1 += sum1 ;
                 an2 += sum2 ; tsk2 += sum2 ;
@@ -818 +841 @@
                 an  += sum  ; tsk  += sum  ;
                 newlineadded=0;
-                char label[1000];
-                gen_label_base(label,leader);
             }
         }
@@ -886 +907 @@
             if ( l==0 ) break;
             if ( l->leader==0 ) continue;
-            char label[1000],resp[100],date[100],kind[100],desc[1000];
+            char label_lnk[1000],label[1000],resp[100],date[100],kind[100],desc[1000];
             gen_label_full(label,l);
+            sprintf(label_lnk,"\\hyperlink{%s}{%s}",label,label);
             sprintf(resp,"\\S%s",partner_table[l->partner].key);
             sprintf(date,"\\makebox[2mm][r]{%d}",l->em);
@@ -902 +924 @@
                 sprintf(desc, "\\\\\\cline{1-4}\n");
 
-             fprintf(curr->os,"%-15s", label);
+             fprintf(curr->os,"%-15s", label_lnk);
              fprintf(curr->os," & %-10s", resp);
              fprintf(curr->os," & %-30s", date);
@@ -913 +935 @@
 }
 
-#if 1
 void do_effort_par_livrable(char* filename,int from_task, int to_task)
 {
@@ -919 +940 @@
     if ( (curr->os=fopen(filename,"w"))==0 ) {
         fprintf(stderr,"can not open %s file for writing.\n",filename);
-        fprintf(stderr,"generation of %s partner table is skipped.\n",filename);
+        fprintf(stderr,"generation of %s file is skipped.\n",filename);
         return;
     }
@@ -953 +974 @@
                 sum2 = lcurr->hman[1]; sum +=sum2;
                 sum3 = lcurr->hman[2]; sum +=sum3;
-                char label[1000],title[1000];
+                char label_lnk[1000],label[1000],title[1000];
                 gen_label_base(label,lcurr);
+                sprintf(label_lnk,"\\hyperlink{%s}{%s}",label,label);
                 sprintf(title,"\\resstablestyletitle{%s}",top->title);
                 fprintf(curr->os,"%10s & %50s & %10s & %2.1f & %2.1f & %2.1f & %2.1f \\\\\\hline\n",
-                   linenb==0 ? label : "",
+                   linenb==0 ? label_lnk : "",
                    linenb==0 ? title : "",
                    partner_table[lcurr->partner].key,
@@ -980 +1002 @@
                 char title[1000];
                 sprintf(name,"st%d-%d",task_n,subtask_n);
-                sprintf(title,"\\resstablestyletitle{%s}","");
+                sprintf(title,"\\resstablestyletitle{%s}",get_subtask_name(task_n,subtask_n));
                 fprintf(curr->os,"%10s & %50s & %10s & %2.1f & %2.1f & %2.1f & %2.1f \\\\\\hline\n",
                     name,title,"total",st_sum1,st_sum2,st_sum3,st_sum);
@@ -999 +1021 @@
     curr->os=0;
 }
+
+void do_partner_by_subtask()
+{
+    char filename[2000];
+    int tn,stn,dn,partner;
+    for (tn=0 ; tn<T_MAX ; tn++) {
+        int livrablenb=0,subtasknb=0;
+        int task_n,subtask_n;
+        double  t_sum1=0, t_sum2=0, t_sum3=0, t_sum=0;
+        double st_sum1=0,st_sum2=0,st_sum3=0,st_sum=0;
+        if (curr->ls[tn][0][0][0]==0) break;
+        for (stn=0; stn<S_MAX; stn++) {
+          int parts[100]; memset(parts,0,sizeof(parts));
+          int partnb=0;
+          for (dn=0; dn<D_MAX; dn++) {
+            int linenb = 0;
+            Tlivrable* top=curr->ls[tn][stn][dn][0];
+            if ( top==0 ) break;
+            double liv1=0,liv2=0,liv3=0,liv=0;
+            for (partner=1 ; partner_table[partner].key!=0 ; partner+=1) {
+                Tlivrable *lcurr,*leader;
+                if ( (lcurr=do_partner_table_getLivrable(&leader,top,partner))==0 ) {
+                    continue;
+                }
+                parts[partner]=1; partnb+=1;
+                task_n = top->tn;
+                subtask_n = top->stn;
+            }
+          }
+          if (partnb==0) continue;
+          sprintf(filename,"tmp/st%d-%d-partner.tex",task_n,subtask_n);
+          if ( (curr->os=fopen(filename,"w"))==0 ) {
+              fprintf(stderr,"can not open %s file for writing.\n",filename);
+              fprintf(stderr,"generation of %s file is skipped.\n",filename);
+              continue;
+          }
+          for ( partner=1 ; partner_table[partner].key!=0 ; partner+=1) {
+            if ( parts[partner]==0) continue;
+            fprintf(curr->os,"\\S%s\n",partner_table[partner].key);
+          }
+          fclose(curr->os);
+          curr->os=0;
+       }
+    }
+}
+
+#if 1
+void do_effort_par_livrable_xls(char* filename,int from_task, int to_task)
+{
+    //struct partner_def* part;
+    if ( (curr->os=fopen(filename,"w"))==0 ) {
+        fprintf(stderr,"can not open %s file for writing.\n",filename);
+        fprintf(stderr,"generation of %s file is skipped.\n",filename);
+        return;
+    }
+    int tn,stn,dn,partner;
+    fprintf(curr->os,"\"task\";\"sub-task\";\"delivrable\";");
+    fprintf(curr->os,"\"cumul\";;;;");
+    for ( partner=1 ; partner_table[partner].key!=0 ; partner+=1) {
+        fprintf(curr->os,"\"%s\";;;;",partner_table[partner].key);
+    }
+    fprintf(curr->os,"\"description\";\n");
+    fprintf(curr->os,";;;");
+    fprintf(curr->os,"\"an 1\";\"an 2\";\"an 3\";\"sum\";");
+    for ( partner=1 ; partner_table[partner].key!=0 ; partner+=1) {
+        fprintf(curr->os,"\"an 1\";\"an 2\";\"an 3\";\"sum\";");
+    }
+    fprintf(curr->os,";\n");
+    double an1=0,an2=0,an3=0,anA=0;
+    double an1p[100], an2p[100], an3p[100], anAp[100];
+    memset(an1p,0,sizeof(an1p)); memset(an2p,0,sizeof(an2p));
+    memset(an3p,0,sizeof(an3p)); memset(anAp,0,sizeof(anAp));
+    for (tn=0 ; tn<T_MAX ; tn++) {
+        int livrablenb=0,subtasknb=0;
+        int task_n,subtask_n;
+        double  t_sum1=0,     t_sum2=0,     t_sum3=0,     t_sumA=0;
+        double  t_sum1p[100], t_sum2p[100], t_sum3p[100], t_sumAp[100];
+        memset(t_sum1p,0,sizeof(t_sum1p)); memset(t_sum2p,0,sizeof(t_sum2p));
+        memset(t_sum3p,0,sizeof(t_sum3p)); memset(t_sumAp,0,sizeof(t_sumAp));
+        if (curr->ls[tn][0][0][0]==0) break;
+        for (stn=0; stn<S_MAX; stn++) {
+          double st_sum1=0,     st_sum2=0,     st_sum3=0,     st_sumA=0;
+          double st_sum1p[100], st_sum2p[100], st_sum3p[100], st_sumAp[100];
+          memset(st_sum1p,0,sizeof(st_sum1p)); memset(st_sum2p,0,sizeof(st_sum2p));
+          memset(st_sum3p,0,sizeof(st_sum3p)); memset(st_sumAp,0,sizeof(st_sumAp));
+          
+          livrablenb=0;
+          for (dn=0; dn<D_MAX; dn++) {
+            int linenb = 0;
+            Tlivrable* top=curr->ls[tn][stn][dn][0];
+            if ( top==0 ) break;
+            if ( !( from_task<=top->tn &&  top->tn<=to_task ) ) break;
+            double liv1=0,liv2=0,liv3=0,liv=0;
+            char label_lnk[1000],label[1000],title[1000];
+            gen_label_base(label,top);
+            sprintf(label_lnk,"\\hyperlink{%s}{%s}",label,label);
+            sprintf(title,"%s",top->title);
+            double sum1p[20], sum2p[20], sum3p[20], sumAp[20];
+            memset(sum1p,0,sizeof(sum1p)); memset(sum2p,0,sizeof(sum2p));
+            memset(sum3p,0,sizeof(sum3p)); memset(sumAp,0,sizeof(sumAp));
+            task_n=top->tn;
+            subtask_n=top->stn;
+            for (partner=1 ; partner_table[partner].key!=0 ; partner+=1) {
+                Tlivrable *lcurr,*leader;
+                if ( (lcurr=do_partner_table_getLivrable(&leader,top,partner))==0 )
+                    continue;
+                double sum1,sum2,sum3,sum=0;
+                sum1 = lcurr->hman[0]; sum +=sum1;
+                sum2 = lcurr->hman[1]; sum +=sum2;
+                sum3 = lcurr->hman[2]; sum +=sum3;
+                linenb += 1;
+                liv1 += sum1 ; st_sum1 += sum1 ; t_sum1 += sum1 ; an1 += sum1 ; 
+                liv2 += sum2 ; st_sum2 += sum2 ; t_sum2 += sum2 ; an2 += sum2 ; 
+                liv3 += sum3 ; st_sum3 += sum3 ; t_sum3 += sum3 ; an3 += sum3 ; 
+                liv  += sum  ; st_sumA += sum  ; t_sumA += sum  ; anA += sum  ; 
+                sum1p[partner] += sum1 ; st_sum1p[partner] += sum1 ; t_sum1p[partner] += sum1 ; an1p[partner] += sum1 ;
+                sum2p[partner] += sum2 ; st_sum2p[partner] += sum2 ; t_sum2p[partner] += sum2 ; an2p[partner] += sum2 ;
+                sum3p[partner] += sum3 ; st_sum3p[partner] += sum3 ; t_sum3p[partner] += sum3 ; an3p[partner] += sum3 ;
+                sumAp[partner] += sum  ; st_sumAp[partner] += sum  ; t_sumAp[partner] += sum  ; anAp[partner] += sum  ;
+            }
+            if (linenb>=1) {
+                livrablenb+=1;
+                fprintf(curr->os,";;\"%s\";",label);
+                fprintf(curr->os,"%2.1f;%2.1f;%2.1f;%2.1f;",liv1,liv2,liv3,liv);
+                for ( partner=1 ; partner_table[partner].key!=0 ; partner+=1) {
+                    fprintf(curr->os,"%2.1f;%2.1f;%2.1f;%2.1f;",
+                        sum1p[partner],sum2p[partner],sum3p[partner],sumAp[partner]);
+                }
+                fprintf(curr->os,"\"%s\";",title);
+                fprintf(curr->os,"\n");
+            }
+          }
+          if ( livrablenb>0) {
+                subtasknb += 1;
+                char name[100];
+                char title[1000];
+                sprintf(name,"st%d-%d",task_n,subtask_n);
+                sprintf(title,"%s",get_subtask_name(task_n,subtask_n));
+                fprintf(curr->os,";\"%s\";;",name);
+                fprintf(curr->os,"%2.1f;%2.1f;%2.1f;%2.1f;",st_sum1,st_sum2,st_sum3,st_sumA);
+                for ( partner=1 ; partner_table[partner].key!=0 ; partner+=1) {
+                    fprintf(curr->os,"%2.1f;%2.1f;%2.1f;%2.1f;",
+                        st_sum1p[partner],st_sum2p[partner],st_sum3p[partner],st_sumAp[partner]);
+                }
+                fprintf(curr->os,"\"%s\";",title);
+                fprintf(curr->os,"\n");
+          }
+       }
+       if ( subtasknb>0 ) {
+                char name[100];
+                char title[1000];
+                sprintf(name,"task-%d",task_n);
+                sprintf(title,"%s",task_names[task_n]);
+                fprintf(curr->os,"\"%s\";;;",name);
+                fprintf(curr->os,"%2.1f;%2.1f;%2.1f;%2.1f;",t_sum1,t_sum2,t_sum3,t_sumA);
+                for ( partner=1 ; partner_table[partner].key!=0 ; partner+=1) {
+                    fprintf(curr->os,"%2.1f;%2.1f;%2.1f;%2.1f;",
+                        t_sum1p[partner],t_sum2p[partner],t_sum3p[partner],t_sumAp[partner]);
+                }
+                fprintf(curr->os,"\"%s\";",title);
+                fprintf(curr->os,"\n");
+       }
+    }
+                char name[100];
+                char title[1000];
+                sprintf(name,"total");
+                sprintf(title,"%s","");
+                fprintf(curr->os,"\"%s\";;;",name);
+                fprintf(curr->os,"%2.1f;%2.1f;%2.1f;%2.1f;",an1,an2,an3,anA);
+                for ( partner=1 ; partner_table[partner].key!=0 ; partner+=1) {
+                    fprintf(curr->os,"%2.1f;%2.1f;%2.1f;%2.1f;",
+                        an1p[partner],an2p[partner],an3p[partner],anAp[partner]);
+                }
+                fprintf(curr->os,"\"%s\";",title);
+                fprintf(curr->os,"\n");
+    fclose(curr->os);
+    curr->os=0;
+}
 #endif
 
@@ -1030 +1230 @@
     prepare2(curr);
     prepare3(curr);
-    do_livrable_tables(40);
+    do_livrable_tables(44);
 
     curr = data_new(0,0);
@@ -1040 +1240 @@
     do_effort_par_livrable("effort-par-livrable-2.tex",4,7);
     do_effort_par_livrable("effort-par-livrable-3.tex",8,8);
+    do_effort_par_livrable_xls("tmp/effort-par-livrable.csv",1,8);
+
+    curr = data_new(0,0);
+    prepare0(curr);
+    prepare1(curr);
+    prepare2(curr);
+    prepare3(curr);
+    do_partner_by_subtask();
     return 0;
 }

anr/section-project-task-schedule.tex

@@ -15 +15 @@
 \definecolor{gtcMilestone}{rgb}{0.9,0.4,0.4}
 \immediate\write\ganttdata{ML=6 ML=12 ML=18 ML=24}
-\def\ganttlabelstyle#1{\begin{small}#1\end{small}}
+%\def\ganttlabelstyle#1{\begin{small}#1\end{small}}
+\def\ganttlabelstyle#1{\begin{small}\hyperlink{#1}{#1}\end{small}}
 \def\gantttitlestyle#1{\begin{scriptsize}\textit{#1}\end{scriptsize}}
 
 \begin{figure}\leavevmode\center
+\hypersetup{
+    %backref=true,
+    %pagebackref=true,
+    %hyperindex=true,
+    colorlinks=true, %colorise les liens
+    breaklinks=true, %permet le retour à la ligne dans les lien
+    urlcolor= blue,  %couleur des hyperliens
+    linkcolor= black  %couleur des liens internes
+}
 \hspace*{-.6cm}
 \input{gantt.tex}

anr/task-backbone.tex

@@ -45 +45 @@
             Magillem and the core engine.
         \end{description}
-    \itemL{6}{12}{d}{\Supmc}{Use model specification}{3:0:0}
+    \itemL{6}{12}{d}{\Supmc}{Use model specification}{2:0:0}
         \setMacroInAuxFile{useModelSpecification}
         The final version of the Use model specification enhanced
         with the feed-backs of the demonstrator \STs.
-        \OtherPartner{0}{12}{\Slip}   {2:0:0}
-        \OtherPartner{0}{12}{\Sirisa} {2:0:0}
-        \OtherPartner{0}{12}{\Stima}  {3:0:0}
-        \OtherPartner{0}{12}{\Subs}   {3:0:0}
-        \OtherPartner{0}{12}{\Sbull}  {2:0:0}
-        \OtherPartner{0}{12}{\Sthales}{2:0:0}
+        \OtherPartner{0}{12}{\Slip}   {1:0:0}
+        \OtherPartner{0}{12}{\Sirisa} {1:0:0}
+        \OtherPartner{0}{12}{\Stima}  {2:0:0}
+        \OtherPartner{0}{12}{\Subs}   {2:0:0}
+        \OtherPartner{0}{12}{\Sbull}  {1:0:0}
+        \OtherPartner{0}{12}{\Sthales}{1:0:0}
         \OtherPartner{0}{12}{\Smds}   {2:0:0}
     \end{livrable}
@@ -80 +80 @@
         developers of HAS tools suggested.
     \itemL{12}{18}{d+x}{\Slip}{\xcoach format specification}{7:3:0}
-        \OtherPartner{0}{18}{\Supmc}  {.5:.5:0}
-        \OtherPartner{0}{18}{\Stima}  {.5:.5:0}
+        \OtherPartner{0}{18}{\Supmc}  {.5:0:0}
+        \OtherPartner{0}{18}{\Stima}  {.5:0:0}
         \setMacroInAuxFile{specXcoachDoc}
         Last release of XML specification of the \xcoach format enhanced with
@@ -101 +101 @@
         The first release of the software tool X2SC  that translates \xcoachplus
         description to CABA and TLM-DT SystemC module.
-    \itemL{18}{24}{x}{\Supmc}{X2SC tool}{0:2:0}
+    \itemL{18}{24}{x}{\Supmc}{X2SC tool}{0:1.5:0}
         \setMacroInAuxFile{specXcoachToSystemC}
         Final release of the former software (\specXcoachToSystemCI).

anr/task-backend.tex

@@ -41 +41 @@
     \itemV{18}{24}{x}{\Supmc}{UGH integration}
         UGH release that writes \xcoachplus format.
-    \itemL{24}{36}{x}{\Stima}{UGH integration}{12:4:3}
-        \OtherPartner{0}{12}{\Supmc}{1:6:3}
+    \itemL{24}{36}{x}{\Stima}{UGH integration}{3:3:1}
+        \OtherPartner{0}{12}{\Supmc}{1:3:1}
         UGH release taking into account demonstrator's feedback.
 %
@@ -70 +70 @@
     \itemV{12}{24}{x}{\Supmc}{Frequency calibration}
         A VHDL description of hardware added to the coprocessor to enable the calibration.
-    \itemL{24}{33}{x}{\Supmc}{Frequency calibration}{2:.5:3.5}
+    \itemL{24}{33}{x}{\Supmc}{Frequency calibration}{1:1:4}
         \setMacroInAuxFile{freqCalibrationVhdl}
         The frequency calibration software consists of a driver in the FPGA-SoC operating

anr/task-csg.tex

@@ -26 +26 @@
         the connection of the coprocessors on the platform bus.
     \begin{livrable}
-    \itemL{9}{18}{h}{\Stima}{HPC hardware \xilinx}{2:7:0}
+    \itemL{18}{30}{h}{\Stima}{HPC hardware \xilinx}{0:2:5}
         \setMacroInAuxFile{hpcPlbBridge}
         The synthesizable VHDL description of a PLB/VCI bridge.
-    \itemL{9}{18}{h}{\Supmc}{HPC hardware \altera}{2:7:0}
+    \itemL{18}{30}{h}{\Supmc}{HPC hardware \altera}{0:2:5}
         \setMacroInAuxFile{hpcAvalonBridge}
         The synthesizable VHDL description of an AVALON/VCI bridge.
@@ -44 +44 @@
         The drivers required for the second CSG milestone.
     \itemL{18}{33}{x}{\Stima}{DNA OS drivers for SoCLib}{6:2:2}
-        \OtherPartner{6}{33}{\Supmc}  {2:1:1}
+        \OtherPartner{6}{33}{\Supmc}  {.5:.5:.5}
         \mustbecompleted{TIMA : ajouter des précisions sur le travail et ce
         que fait upmc}
         Final release of the DNA OS drivers.
-    \itemL{6}{18}{x}{\Stima}{Driver ports}{3:1:0}
+    \itemL{12}{18}{x}{\Stima}{Driver ports}{0:2:0}
+        \OtherPartner{6}{33}{\Supmc}  {0:2:0}
     \mustbecompleted{TIMA: tima sur Microblaze, UPMC sur Nios}
         Porting of DNA OS on the NIOS2 and MICROBLAZE processors.
@@ -64 +65 @@
         This release extends CSG to FPGA-SoC generation for the \xilinx and
                 \altera architectural template.
-    \itemL{24}{36}{x}{\Supmc}{CSG tool}{6:5.5:5.5}
+    \itemL{24}{36}{x}{\Supmc}{CSG tool}{5:3:2}
         \OtherPartner{0}{36}{\Stima}{0:6:0}
-        \mustbecompleted{TIMA : integration d'OS dans CSG, en
-        particulier DNA}
+        \OtherPartner{0}{36}{\Smds}{0:6:0}
                 \setMacroInAuxFile{csgImplementation}
+        \mustbecompleted{TIMA : integration d'OS dans CSG, en particulier DNA}
         Final release of CSG enhanced by the demonstrator's feedback.
     \end{livrable}

anr/task-demonstrator.tex

@@ -86 +86 @@
     3) the design time from a high level description.
     \begin{livrable}
-      \itemV{24}{30}{d+x}{\Smds}{\mds evaluation}
-        This deliverable is a document describing the result got for the application
-        (\mdsAppSpecification) using COACH milestone of T0+24.
-      \itemL{30}{36}{d+x}{\Smds}{\mds evaluation}{0:5:5}
-        This deliverable is a document that validates and evaluates COACH (final release)
-        for the \mds demonstrators (\mdsAppSpecification).
-%
-      \itemV{24}{30}{d+x}{\Sbull}{\bull evaluation}
-        This deliverable is a document describing the result got for the application
-        (\bullAppSpecification) using COACH milestone of T0+24.
-      \itemL{30}{36}{d+x}{\Sbull}{\bull evaluation}{0:5:5}
-        This deliverable is a document that validates and evaluates COACH (final release)
-        for the \bull demonstrators (\bullAppSpecification).
-%
-      \itemV{18}{24}{d+x}{\Sthales}{\thales evaluation}
-        This deliverable is a document describing the result got for the application
-        (\trtAppSpecification) with SPEAR-DE (\trtSpearde) using COACH milestone of T0+18.
-        The updated code of the application will be also provide.
-      \itemV{24}{30}{d+x}{\Sthales}{\thales evaluation}
-        This deliverable is a document describing the result got for the application
-        (\trtAppSpecification) with SPEAR-DE (\trtSpearde) using COACH milestone of T0+24.
-        The updated code of the application will be also provide.
-      \itemL{30}{36}{d+x}{\Sthales}{\thales evaluation}{0:5:5}
-        This deliverable is a document that validates and evaluates COACH (final release)
-        for the \thales demonstrators (\trtAppSpecification).
-        The updated code of the application will be also provide.
+      \itemV{18}{24}{d+x}{\Smds}{Evaluation}
+        This deliverable written by \Smds, \Sbull and \Sthales is a document
+        that synthesizes the results got for the demonstrators
+        (\NOVERSbullAppSpecification, \NOVERStrtAppSpecification,
+        \NOVERStrtSpearde, \NOVERSmdsAppSpecification)
+        using the COACH milestone of T0+18.
+      \itemV{24}{30}{d+x}{\Smds}{Evaluation}
+        Same as former but for the milestone of T0+24.
+      \itemL{30}{36}{d+x}{\Smds}{Evaluation}{0:5:5}
+        \OtherPartner{18}{36}{Sbull}{0:5:5}
+        \OtherPartner{18}{36}{Sthales}{0:5:5}
+        This deliverable is a document that validates and evaluates the COACH final release
+        for the demonstrators.
+        %(\NOVERSbullAppSpecification, \NOVERStrtAppSpecification,
+        %\NOVERStrtSpearde, \NOVERSmdsAppSpecification).
+        The final code of the application demonstrators (\NOVERSbullAppSpecification,
+        \NOVERStrtAppSpecification) will be provide.
     \end{livrable}
+%% GROUPED ABOVE%%     \begin{livrable}
+%% GROUPED ABOVE%%       \itemV{24}{30}{d+x}{\Smds}{\mds evaluation}
+%% GROUPED ABOVE%%         This deliverable is a document describing the result got for the application
+%% GROUPED ABOVE%%         (\mdsAppSpecification) using COACH milestone of T0+24.
+%% GROUPED ABOVE%%       \itemL{30}{36}{d+x}{\Smds}{\mds evaluation}{0:5:5}
+%% GROUPED ABOVE%%         This deliverable is a document that validates and evaluates COACH (final release)
+%% GROUPED ABOVE%%         for the \mds demonstrators (\mdsAppSpecification).
+%% GROUPED ABOVE%% %
+%% GROUPED ABOVE%%       \itemV{24}{30}{d+x}{\Sbull}{\bull evaluation}
+%% GROUPED ABOVE%%         This deliverable is a document describing the result got for the application
+%% GROUPED ABOVE%%         (\bullAppSpecification) using COACH milestone of T0+24.
+%% GROUPED ABOVE%%       \itemL{30}{36}{d+x}{\Sbull}{\bull evaluation}{0:5:5}
+%% GROUPED ABOVE%%         This deliverable is a document that validates and evaluates COACH (final release)
+%% GROUPED ABOVE%%         for the \bull demonstrators (\bullAppSpecification).
+%% GROUPED ABOVE%% %
+%% GROUPED ABOVE%%       \itemV{18}{24}{d+x}{\Sthales}{\thales evaluation}
+%% GROUPED ABOVE%%         This deliverable is a document describing the result got for the application
+%% GROUPED ABOVE%%         (\trtAppSpecification) with SPEAR-DE (\trtSpearde) using COACH milestone of T0+18.
+%% GROUPED ABOVE%%         The updated code of the application will be also provide.
+%% GROUPED ABOVE%%       \itemV{24}{30}{d+x}{\Sthales}{\thales evaluation}
+%% GROUPED ABOVE%%         This deliverable is a document describing the result got for the application
+%% GROUPED ABOVE%%         (\trtAppSpecification) with SPEAR-DE (\trtSpearde) using COACH milestone of T0+24.
+%% GROUPED ABOVE%%         The updated code of the application will be also provide.
+%% GROUPED ABOVE%%       \itemL{30}{36}{d+x}{\Sthales}{\thales evaluation}{0:5:5}
+%% GROUPED ABOVE%%         This deliverable is a document that validates and evaluates COACH (final release)
+%% GROUPED ABOVE%%         for the \thales demonstrators (\trtAppSpecification).
+%% GROUPED ABOVE%%         The updated code of the application will be also provide.
+%% GROUPED ABOVE%%     \end{livrable}
 
 \end{workpackage}

anr/task-dissemination.tex

@@ -6 +6 @@
 \begin{objectif}
 This task relates to the diffusion of the project results.
-The objective is to ensure the COACH dissemination by publishing on a public WEB site all
-the information that a COACH user requires.
-Those are:
+The objective is to ensure the COACH dissemination
+by writing papers,
+by presenting COACH in trade shows
+and by publishing on a public WEB site all the information that a COACH user requires.
+Those lasts are:
 \begin{itemize}
   \item The packaging of COACH milestones and final release and their associated
@@ -23 +25 @@
     \begin{livrable}
       \itemL{6}{36}{d+x}{\Supmc}{Open source release}{1:.5:.5}
-        \OtherPartner{12}{36}{\Stima}{0:2:1}
         This deliverable deals with the packaging of the open sources  milestones and
         final releases with their installation manuals and to publish then into the WEB
@@ -47 +48 @@
         task graph can be obtained.
         \end{description}
-    \itemV{18}{24}{d}{\Supmc}{Tutorial}
-        \OtherPartner{12}{36}{\Smds}{0:2:2}
-        It will illustrate the HAS tools and architectural template available in
-        T0+24 milestone.\par
-        A section (written by \Supmc) will show how a task can be migrated to
-        coprocessor using HAS tools and how FPGA-SoC can be generated and run to
-        FPGA.\par
-        A section (written by \Smds) will be dedicated to the integration of
-        COACH generated IP into an IP-XACT based design flow (such as SOCKET).
-    \itemL{30}{36}{d}{\Supmc}{Tutorial}{2:1:1}
-        The final release of the tutorial.
+    \itemL{30}{36}{d}{\Supmc}{Tutorial}{1.5:0.0:1.5}
+        \OtherPartner{30}{36}{\Smds}{0:0:2}
+        The final release of the tutorial. It will be completed with sections
+        that illustrate:
+        \begin{description}
+          \item[HAS (\Supmc)] This section shows how a task can be migrated to
+            coprocessor using HAS tools and how FPGA-SoC can be generated and run to
+            FPGA.
+          \item[Inegration (\Smds)] This section is dedicated to the integration of
+            COACH generated IP into an IP-XACT based design flow such as SOCKET.
+        \end{description}
     \end{livrable}
 %
@@ -74 +75 @@
         This user manual describes how to use COACH within the IP-XACT based Magillem tool suite.
    \end{livrable}
+%
+  \subtask{Make to know}  
+   \begin{livrable}
+   \itemL{12}{36}{d}{\Smds}{Make to know}{0:3:3}
+        \OtherPartner{12}{36}{\Sirisa} {0:1:1}
+        \OtherPartner{12}{36}{\Slip}   {0:1:1}
+        \OtherPartner{12}{36}{\Stima}  {0:1:1}
+        \OtherPartner{12}{36}{\Subs}   {0:1:1}
+        \OtherPartner{12}{36}{\Supmc}  {0:1:1}
+        \OtherPartner{12}{36}{\Sbull}  {0:1:1}
+        \OtherPartner{12}{36}{\Sthales}{0:1:1}
+        This deliverable groups the effort to make to know COACH. It consists
+        mainly in writing/submitting papers and in presenting COACH in to trade
+        show and workshop and organizing a final white paper.
+   \end{livrable}
 \end{workpackage}

anr/task-hpc.tex

@@ -41 +41 @@
         A library implementing the communication API defined in the {\hpcCommApi} deliverable.
         This library is dedicated to help the end-user to partition an application for HPC.
-      \itemL{12}{21}{x}{\Supmc}{HPC API for Linux PC}{0:2.5:0}
+      \itemL{12}{21}{x}{\Supmc}{HPC API for Linux PC}{0:2:0}
         \setMacroInAuxFile{hpcCommLinux}
         The PC part of the HPC communication API that communicates with the FPGA-SOC, a
@@ -54 +54 @@
     required by the neutral architectural template for using the PCI/X IP of \altera and \xilinx.
     \begin{livrable}
-    \itemL{9}{24}{h}{\Supmc}{PCI/X traffic generator}{1:1:0}
+    \itemL{12}{24}{h}{\Supmc}{PCI/X traffic generator}{0:1:0}
         The SystemC description of a component that generates PCI/X traffic. It is
         required to prototype FPGA-SoC dedicated to HPC.