Index: /anr/Makefile =================================================================== --- /anr/Makefile (revision 146) +++ /anr/Makefile (revision 147) @@ -14,5 +14,6 @@ TABLES= table_upmc_full.tex table_upmc_short.tex \ table_tima_full.tex table_tima_short.tex \ - table_lip_full.tex table_lip_short.tex \ + table_inria_cairn_full.tex table_inria_cairn_short.tex \ + table_inria_compsys_full.tex table_inria_compsys_short.tex \ table_ubs_full.tex table_ubs_short.tex \ table_xilinx_full.tex table_xilinx_short.tex \ @@ -20,5 +21,6 @@ table_thales_full.tex table_thales_short.tex \ table_zied_full.tex table_zied_short.tex \ - table_inria_cairn_full.tex table_inria_cairn_short.tex \ + table_navtel_full.tex table_navtel_short.tex \ + table_livrable_01.tex table_livrable_02.tex # PROGRAMS Index: /anr/anr.tex =================================================================== --- /anr/anr.tex (revision 146) +++ /anr/anr.tex (revision 147) @@ -14,4 +14,5 @@ \usepackage{geometry} \usepackage{textcomp} +\usepackage{multirow} \geometry{verbose,a4paper,tmargin=3cm,bmargin=2cm,lmargin=2cm,rmargin=2cm} @@ -47,7 +48,6 @@ \def\Sformat#1{\begin{small}\textsc{#1}\end{small}} \def\inria{INRIA\xspace} \def\Sinria{\Sformat{INRIA}\xspace} -\def\irisa{INRIA/CAIRN\xspace} \def\Sirisa{\Sformat{IN/CN}\xspace} -%\def\citi{CITI\xspace} \def\Sciti{\Sformat{CITI}\xspace} -\def\lip{INRIA/COMPSYS\xspace} \def\Slip{\Sformat{IN/CS}\xspace} +\def\irisa{INRIA/CAIRN\xspace} \def\Sirisa{\Sformat{INCN}\xspace} +\def\lip{INRIA/COMPSYS\xspace} \def\Slip{\Sformat{INCS}\xspace} \def\tima{TIMA\xspace} \def\Stima{\Sformat{TIMA}\xspace} \def\ubs{LAB-STICC\xspace} \def\Subs{\Sformat{UBS}\xspace} Index: /anr/gantt.l =================================================================== --- /anr/gantt.l (revision 146) +++ /anr/gantt.l (revision 147) @@ -41,17 +41,17 @@ }; struct partner_def { char *key, *name, *fnfull, *fnshort; } partner_table[] = { - { "UNKNOW" ,"relax" ,0 ,0 }, + { "UNKNOW" ,"relax" ,0 ,0 }, { "irisa" ,"irisa" ,"table_inria_cairn_full.tex" ,"table_inria_cairn_short.tex" }, - { "inria_compsys" ,"inria_compsys" ,"table_inria_compsys_full.tex" ,"table_inria_compsys_short.tex" }, - { "tima" ,"tima" ,"table_tima_full.tex" ,"table_tima_short.tex" }, - { "ubs" ,"ubs" ,"table_ubs_full.tex" ,"table_ubs_short.tex" }, - { "upmc" ,"upmc" ,"table_upmc_full.tex" ,"table_upmc_short.tex" }, - { "altera" ,"altera" ,"table_altera_full.tex" ,"table_altera_short.tex" }, - { "xilinx" ,"xilinx" ,"table_xilinx_full.tex" ,"table_xilinx_short.tex" }, - { "bull" ,"bull" ,"table_bull_full.tex" ,"table_bull_short.tex" }, - { "thales" ,"thales" ,"table_thales_full.tex" ,"table_thales_short.tex" }, - { "zied" ,"zied" ,"table_zied_full.tex" ,"table_zied_short.tex" }, - { "navtel" ,"navtel" ,"table_navtel_full.tex" ,"table_navtel_short.tex" }, - { 0 ,0 ,0 ,0 }, + { "lip" ,"lip" ,"table_inria_compsys_full.tex","table_inria_compsys_short.tex" }, + { "tima" ,"tima" ,"table_tima_full.tex" ,"table_tima_short.tex" }, + { "ubs" ,"ubs" ,"table_ubs_full.tex" ,"table_ubs_short.tex" }, + { "upmc" ,"upmc" ,"table_upmc_full.tex" ,"table_upmc_short.tex" }, + { "altera" ,"altera" ,"table_altera_full.tex" ,"table_altera_short.tex" }, + { "xilinx" ,"xilinx" ,"table_xilinx_full.tex" ,"table_xilinx_short.tex" }, + { "bull" ,"bull" ,"table_bull_full.tex" ,"table_bull_short.tex" }, + { "thales" ,"thales" ,"table_thales_full.tex" ,"table_thales_short.tex" }, + { "zied" ,"zied" ,"table_zied_full.tex" ,"table_zied_short.tex" }, + { "navtel" ,"navtel" ,"table_navtel_full.tex" ,"table_navtel_short.tex" }, + { 0 ,0 ,0 ,0 }, }; @@ -383,5 +383,5 @@ Tlivrable* lu= p->vers[p->nbvers-1]; int i; -fprintf(stderr,"--------------------\n"); +//fprintf(stderr,"--------------------\n"); for (i=0 ; inbvers ; i++) { Tlivrable* l= p->vers[i]; @@ -764,4 +764,73 @@ } +void do_livrable_tables_open(int tablenum, int last) +{ + char fn[1024]; + + if (curr->os!=0) { + fprintf(curr->os,"\\end{tabular}\n"); + fclose(curr->os); + curr->os = 0; + } + + if ( last ) + return; + + sprintf(fn,"table_livrable_%02d.tex",tablenum); + if ( (curr->os=fopen(fn,"w"))==0 ) { + fprintf(stderr,"FATAL: can not open %s file for writing.\n",fn); + exit(1); + } + fprintf(curr->os,"\\begin{tabular}[t]{|l|c|c|c|p{\\desclen}|}\\hline\n"); + fprintf(curr->os,"number & resp. & T0+ & kd & description\\\\\\hline\\hline\n"); +} + +void do_livrable_tables(int maxlines) +{ + int nblines=maxlines; + int nbfile=1; + int tn,stn,dn,v; + do_livrable_tables_open(nbfile,0); nbfile +=1 ; + for (tn=0 ; tnls[tn][0][0][0]==0 ) break; + for (stn=0; stnls[tn][stn][0][0]==0 ) break; + for (dn=0; dnls[tn][stn][dn][0]; + if ( top==0 ) break; + Tlivrable* last=top->vers[top->nbvers-1]; + if ( (nblines-top->nbvers) <= 0 ) { + do_livrable_tables_open(nbfile,0); nbfile +=1 ; + nblines = maxlines; + } + for (v=0; vls[tn][stn][dn][v]; + if ( l==0 ) break; + if ( l->dn<0 ) continue; + char label[1000],resp[100],date[100],kind[100],desc[1000]; + gen_label_full(label,l); + sprintf(resp,"\\S%s",partner_table[l->partner].key); + sprintf(date,"%d",l->em); + sprintf(kind,"%s","x"); + if ( top->nbvers == 1 ) + sprintf(desc,"%s \\\\\\hline\n",last->title); + else if ( v==(top->nbvers-1) ) + sprintf(desc, + "\\multirow{-%d}{\\desclen}{%s}\\\\\\hline\n", + top->nbvers,last->title); + //else if ( v==(top->nbvers-1) ) + // sprintf(desc, "\\\\\\hline\n"); + else + sprintf(desc, "\\\\\\cline{1-4}\n"); + + fprintf(curr->os,"%-15s", label); + fprintf(curr->os," & %-10s", resp); + fprintf(curr->os," & %-10s", date); + fprintf(curr->os," & %-8s", kind); + fprintf(curr->os," & %s", desc); + nblines -= 1; + } + }}} + do_livrable_tables_open(nbfile,1); +} + int main() { @@ -779,14 +848,21 @@ prepare2(curr); prepare3(curr); - do_partner_table_full(1); do_partner_table_short(1); - do_partner_table_full(3); do_partner_table_short(3); - do_partner_table_full(4); do_partner_table_short(4); - do_partner_table_full(5); do_partner_table_short(5); - do_partner_table_full(7); do_partner_table_short(7); - do_partner_table_full(8); do_partner_table_short(8); - do_partner_table_full(9); do_partner_table_short(9); + do_partner_table_full(1); do_partner_table_short(1); + do_partner_table_full(2); do_partner_table_short(3); + do_partner_table_full(3); do_partner_table_short(3); + do_partner_table_full(4); do_partner_table_short(4); + do_partner_table_full(5); do_partner_table_short(5); + do_partner_table_full(7); do_partner_table_short(7); + do_partner_table_full(8); do_partner_table_short(8); + do_partner_table_full(9); do_partner_table_short(9); do_partner_table_full(10); do_partner_table_short(10); do_partner_table_full(11); do_partner_table_short(10); + curr = data_new(0,0); + prepare0(curr); + prepare1(curr); + prepare2(curr); + prepare3(curr); + do_livrable_tables(66); return 0; } Index: /anr/section-4.4.tex =================================================================== --- /anr/section-4.4.tex (revision 146) +++ /anr/section-4.4.tex (revision 147) @@ -89,3 +89,23 @@ virtual prototyping. \end{description} - +\parlf +Finally the list of all the delivrables is presented on figure~\ref{all-delibrables}. +\begin{figure}\leavevmode\center +{ +\fontsize{7pt}{9pt} +\selectfont +%\begin{scriptsize} +\newlength{\desclen} +\settowidth\desclen{\xcoach format specification} +\settowidth\desclen{XILINX RTL optimisation (5)} +\def\Sformat#1{\textsc{#1}} +\hspace*{-2.5mm} +\begin{minipage}{1.1\linewidth} +\input{table_livrable_01.tex} +\hspace{1mm} +\input{table_livrable_02.tex} +\end{minipage} +} +\caption{\label{all-delivrables}All the delivrables} +%\end{scriptsize} +\end{figure}