Index: /anr/annexe-autre-participation.tex =================================================================== --- /anr/annexe-autre-participation.tex (revision 302) +++ /anr/annexe-autre-participation.tex (revision 303) @@ -5,2 +5,24 @@ l'appel à projets, le titre du projet et le nom du coordinateur.} +\newenvironment{autreprojettabular}{% + \noindent\begin{tabular}{|c|p{1.6cm}|c|p{3.75cm}|p{3.5cm}|p{1.6cm}|p{2.0cm}|}\hline + Part. & Name & PM + & Project name, financing institution, grant allocated + & Project title + & Coordi\-nator name + & Start \& end date + \\\hline\hline + }{\end{tabular}\vspace{.75ex}\\} + +\def\autreprojettabularentry#1#2#3#4#5#6#7{#1 & #2 & #3 & #4 & #5 & #6 & #7 \\\hline} + +\begin{autreprojettabular} + +\autreprojettabularentry + {5}{Greiner}{13} + {\mustbecompleted{FIXME-exemple}Tsar, UE, 200 k\euro} + {\mustbecompleted{Term Smart Argh Real}} + {Dupont} + {01/01/2008 12/31/2010} + +\end{autreprojettabular} Index: /anr/annexe-cv.tex =================================================================== --- /anr/annexe-cv.tex (revision 302) +++ /anr/annexe-cv.tex (revision 303) @@ -1,2 +1,39 @@ \anrdoc{1 page maximum par personne (Cf. 5.3).} +\newenvironment{cvenv}[4]{% + % #1 : {Nom}{Prenom}{age} + % #2 : situation actuelle + % #3 : cursus + % #4 : {#}{recent pub} + \noindent + \begin{tabular}{|p{3.3cm}|p{4.3cm}|p{1.4cm}|p{6.3cm}|}\hline + \def\tmp##1##2##3{Name: ##1&First Name: ##2&age: ##3}\tmp#1 + & + \def\tmp##1##2{##1 publications: ##2}\tmp#4 + \\\hline + \end{tabular} + \begin{description} + \item[Situation] #2 + \item[Cursus] #3 + }{\end{description}\vspace*{1.ex}} + +\begin{cvenv} + {{Aug\'e}{Ivan}{50}} + {Ma\^itre de conf\'erences at ENSIIE (Evry Essonne)} + {HDR Thesis (2008), Thesis (1990), ENSIIE Engineer (1983)} + {{20}{\cite{ia-hdr} \cite{ugh08} \cite{disydent05}}} + + \item[Courses of lecture] System, Kernel, Network, Computer Architecture, Programing. + \item[Projects]\mbox{} + \begin{itemize} + \item Worked on COSY european project \cite{cosy}. + \item Work on UGH since 1996 \cite{ugh08}. + \item Worked on Disydent \cite{disydent05}. + \end{itemize} + \item[Other work experiences]\mbox{} + \begin{itemize} + \item Work as system administrator since six years at ENSIIE. + \item Worked as a senior engineer for four years at Philips. + \item Worked as engineer for two years at ANIRAL-UTEC. + \end{itemize} +\end{cvenv} Index: /anr/anr.bib =================================================================== --- /anr/anr.bib (revision 302) +++ /anr/anr.bib (revision 303) @@ -117,7 +117,9 @@ booktitle = {High-Level Synthesis: From Algorithm to Digital Circuits}, publisher = {Springer}, + year = {2008}, chapter = {10}, - year = {2008}, -} + pages = {139-148}, +} + %editor = { Philippe Coussy and Adam Moriawiec}, @misc{pico, @@ -708,2 +710,53 @@ ,YEAR = 1996, VOLUME = 15, NUMBER = 5, PAGES = {529--557} } + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%% IA + +@PHDTHESIS{ia-hdr-phd, + author = {Ivan Aug\'{e}}, + title = {Th\`ese d'Habilitation \`a Diriger des Recherches: + Synth\`ese de haut niveau \& Int\'egration + des syst\`emes mat\'eriel/logiciel}, + school = {Universit\'e Pierre et Marie Curie}, + year = {2009}, + month = {12}, +} + +@MISC{ia-hdr, + author = {Ivan Aug\'{e}}, + title = {Th\`ese d'Habilitation \`a Diriger des Recherches: + Synth\`ese de haut niveau \& Int\'egration + des syst\`emes mat\'eriel/logiciel}, + howpublished = {Universit\'e Pierre et Marie Curie}, + year = {2009}, + month = {12}, +} + +@INBOOK{ia-ugh08, + author = {Ivan Aug\'{e} and Fr\'{e}d\'{e}ric P\'{e}trot}, + title = {User Guided High Level Synthesis}, + booktitle = {High-Level Synthesis: From Algorithm to Digital Circuits}, + publisher = {Springer}, + chapter = {10}, + year = {2008}, + pages = {139-148}, +} + %editor = {Philippe Coussy and Adam Moriawiec}, + +@misc{ia-ugh-09-aspdac, + author = {Fr\'ed\'eric P\'etrot and Ivan Aug\'e}, + title = {User Guided High Level Synthesis}, + booktitle= {Workshop "High-Level Synthesis: Next Step to Efficient ESL Design", + in conjunction with ASP-DAC}, + year = {2009}, +} + +@misc{ia-ugh-08-date, + author = {Fr\'ed\'eric P\'etrot and Ivan Aug\'e}, + title = {User Guided High Level Synthesis}, + booktitle= { Workshop "The New Wave of the High-Level Synthesis", + in conjunction with DATE}, + year = {2008}, +} + Index: /anr/anr.tex =================================================================== --- /anr/anr.tex (revision 302) +++ /anr/anr.tex (revision 303) @@ -275,9 +275,8 @@ \newpage\section{Effort tables} %\begin{small} -\input{effort-par-livrable-1.tex} -\newpage -\input{effort-par-livrable-2.tex} -\newpage -\input{effort-par-livrable-3.tex} +\noindent\input{tmp/effort-par-livrable-1.tex} +\newpage\noindent\input{tmp/effort-par-livrable-2.tex} +\newpage\noindent\input{tmp/effort-par-livrable-3.tex} +\newpage\noindent\input{tmp/effort-par-livrable-4.tex} %\end{small} Index: /anr/gantt.l =================================================================== --- /anr/gantt.l (revision 302) +++ /anr/gantt.l (revision 303) @@ -943,5 +943,5 @@ return; } - fprintf(curr->os,"\\begin{tabular}{|c|l||c|r|r|r||r|}\\hline\n"); + fprintf(curr->os,"\\begin{tabular}{|l|l||c|r|r|r||r|}\\hline\n"); fprintf(curr->os, "number & \\multicolumn{1}{c||}{title} & part. & \\multicolumn{3}{c||}{years } & total \\\\\\cline{4-6}\n"); @@ -976,11 +976,13 @@ char label_lnk[1000],label[1000],title[1000]; gen_label_base(label,lcurr); - sprintf(label_lnk,"\\hyperlink{%s}{%s}",label,label); + sprintf(label_lnk,"\\hspace{1.5cm}\\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", + fprintf(curr->os,"%s %10s & %50s & %10s & %2.1f & %2.1f & %2.1f & %2.1f \\\\\n", + linenb==0 ? "" : "\\cline{3-7}\n", linenb==0 ? label_lnk : "", linenb==0 ? title : "", partner_table[lcurr->partner].key, - sum1,sum2,sum3,sum); + sum1,sum2,sum3,sum + ); linenb += 1; liv1 += sum1 ; st_sum1 += sum1 ; t_sum1 += sum1 ; an1 += sum1 ; @@ -989,11 +991,14 @@ liv += sum ; st_sum += sum ; t_sum += sum ; an += sum ; } - if (linenb>1) - fprintf(curr->os,"%10s & %50s & %10s & %2.1f & %2.1f & %2.1f & %2.1f \\\\\\hline\n", - "","","total",liv1,liv2,liv3,liv); if (linenb>=0) { livrablenb +=1; task_n=top->tn; subtask_n=top->stn; + if (linenb>1) { + fprintf(curr->os,"\\cline{3-7}\n"); + fprintf(curr->os,"%10s & %50s & %10s & %2.1f & %2.1f & %2.1f & %2.1f \\\\\\hline\n", + "","","total",liv1,liv2,liv3,liv); + } else + fprintf(curr->os,"\\cline{1-7}\n"); } } @@ -1001,5 +1006,5 @@ char name[100]; char title[1000]; - sprintf(name,"st%d-%d",task_n,subtask_n); + sprintf(name,"\\hspace{0.5cm}st%d-%d",task_n,subtask_n); 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", @@ -1237,7 +1242,8 @@ prepare2(curr); prepare3(curr); - do_effort_par_livrable("effort-par-livrable-1.tex",1,3); - 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("tmp/effort-par-livrable-1.tex",1,2); + do_effort_par_livrable("tmp/effort-par-livrable-2.tex",3,5); + do_effort_par_livrable("tmp/effort-par-livrable-3.tex",6,7); + do_effort_par_livrable("tmp/effort-par-livrable-4.tex",8,8); do_effort_par_livrable_xls("tmp/effort-par-livrable.csv",1,8); Index: /anr/section-consortium-people.tex =================================================================== --- /anr/section-consortium-people.tex (revision 302) +++ /anr/section-consortium-people.tex (revision 303) @@ -31,4 +31,8 @@ \begin{peopletabular} +\peopletabularentry{\mds} +coordinator & Vaumorin & Emannuel & ... & ... & ... & ... \\\hline +... & ... & ... & ... & ... & ... & ... \\\hline + \peopletabularentry{\irisa} ... & Derien & Steven & ... & ... & ... & ... \irisa \\\hline @@ -55,8 +59,4 @@ Responsible of Task-3. Participation to Task-2/5/6/8. \\\hline -\peopletabularentry{\mds} -responsible & Vaumorin & Emannuel & ... & ... & ... & ... \\\hline -... & ... & ... & ... & ... & ... & ... \\\hline - \peopletabularentry{\bull} responsible & Nguyen & Huy-nam & ... & HPC ... & ... & ... \\\hline