Author: jcouteau Date: 2009-04-28 13:31:17 +0000 (Tue, 28 Apr 2009) New Revision: 124 Modified: trunk/exports/RejetsNombre.java trunk/exports/RejetsPoids.java Log: Adaptation aux scripts de St?\195?\169phanie Modified: trunk/exports/RejetsNombre.java =================================================================== --- trunk/exports/RejetsNombre.java 2009-04-28 13:29:04 UTC (rev 123) +++ trunk/exports/RejetsNombre.java 2009-04-28 13:31:17 UTC (rev 124) @@ -21,25 +21,22 @@ /** * RejetsNombre.java - * + * * Created: 23 novembre 2006 - * + * * @author anonymous <anonymous@labs.libre-entreprise.org> * @version $Revision: 1.4 $ - * - * Last update: $Date: 2007-05-24 09:30:07 $ - * by : $Author: bpoussin $ + * + * Last update: $Date: 2007-05-24 09:30:07 $ by : $Author: bpoussin $ */ - @Doc(value="do the doc of class RejetsNombre") +@Doc(value = "do the doc of class RejetsNombre") public class RejetsNombre implements Export { /** to use log facility, just put in your code: log.info("..."); */ static private Log log = LogFactory.getLog(RejetsNombre.class); - protected String [] necessaryResult = { - ResultName.MATRIX_DISCARDS_PER_STR_MET_PER_ZONE_POP - }; - + protected String[] necessaryResult = { ResultName.MATRIX_DISCARDS_PER_STR_MET }; + public String[] getNecessaryResult() { return this.necessaryResult; } @@ -47,74 +44,79 @@ public String getExportFilename() { return "RejetsNombre"; } - + public String getExtensionFilename() { return ".csv"; } - + public String getDescription() { return _("Export les rejets en nombre de la simulation. tableau pop;metier;id;zone;date;nombre"); } - public void export(SimulationStorage simulation, Writer out) throws Exception { - Date lastDate = simulation.getResultStorage().getLastDate(); - + public void export(SimulationStorage simulation, Writer out) + throws Exception { + Date lastDate = simulation.getResultStorage().getLastDate(); + for (Population pop : simulation.getParameter().getPopulations()) { - for (Date date = new Date(0); !date.after(lastDate); date = date.next() ) { - MatrixND mat = simulation.getResultStorage().getMatrix(date, pop, ResultName.MATRIX_DISCARDS_PER_STR_MET_PER_ZONE_POP); + for (Date date = new Date(0); !date.after(lastDate); date = date + .next()) { + MatrixND mat = simulation.getResultStorage().getMatrix(date, + pop, ResultName.MATRIX_DISCARDS_PER_STR_MET); if (mat != null) { // can be null if simulation is stopped before last year simulation mat = mat.sumOverDim(0); //sum on strategy - for (MatrixIterator i=mat.iterator(); i.hasNext();) { + for (MatrixIterator i = mat.iterator(); i.hasNext();) { i.next(); - Object [] sems = i.getSemanticsCoordinates(); - Metier metier = (Metier)sems[1]; - PopulationGroup group = (PopulationGroup)sems[2]; - Zone zone = (Zone)sems[3]; - + Object[] sems = i.getSemanticsCoordinates(); + Metier metier = (Metier) sems[1]; + PopulationGroup group = (PopulationGroup) sems[2]; + Zone zone = (Zone) sems[3]; + double val = i.getValue(); - out.write(pop.getName() +";"+ metier.getName() +";"+ group.getId() +";"+ zone.getName() +";"+ date.getDate() +";"+ val +"\n"); + out.write(pop.getName() + ";" + metier.getName() + ";" + + group.getId() + ";" + zone.getName() + ";" + + date.getDate() + ";" + val + "\n"); } } } } -/* -var Parametre=sim.getParametre(); -var Populations=Parametre.getPopulations(); -var PDate=Packages.fr.ifremer.nodb.Date; + /* + var Parametre=sim.getParametre(); + var Populations=Parametre.getPopulations(); + var PDate=Packages.fr.ifremer.nodb.Date; -var capture=0.0; -var result=""; -writeln("debut de export rejets nombre"); -var dateexport=new Packages.java.util.Date(); -var formatteur= new Packages.java.text.SimpleDateFormat(); -writeln("heure de debut: "+formatteur.format(dateexport)); -var finsimu=resultats.getLastDate().getDate(); + var capture=0.0; + var result=""; + writeln("debut de export rejets nombre"); + var dateexport=new Packages.java.util.Date(); + var formatteur= new Packages.java.text.SimpleDateFormat(); + writeln("heure de debut: "+formatteur.format(dateexport)); + var finsimu=resultats.getLastDate().getDate(); -for (var ipop=Populations.iterator();ipop.hasNext();){ - var pop=ipop.next(); - for (var idate=0;idate<=finsimu;idate++){ - var date=new PDate(idate); - var matrice=resultats.getMatrix(date,pop ,"Rejet par metier"); - if (matrice==null){ - matrice=MatrixFactory.create(resultats.getMatrix(new PDate(0),pop ,"Rejet par metier")); - matrice.mults(0); - } - var temp=matrice.sumOverDim(0); - writeln("on a la matrice"); - for (var iiterateur=temp.iterator();iiterateur.next();){ - var coordonnees=iiterateur.getSemanticsCoordinates(); - var metier=coordonnees[1]; - var c=coordonnees[2]; - var z=coordonnees[3]; - capture=iiterateur.getValue(); - result+=pop.getNom()+";"+metier.getNom()+";"+c.getId()+";"+z.getNom()+";"+idate+";"+capture+"\n"; - } - } -} + for (var ipop=Populations.iterator();ipop.hasNext();){ + var pop=ipop.next(); + for (var idate=0;idate<=finsimu;idate++){ + var date=new PDate(idate); + var matrice=resultats.getMatrix(date,pop ,"Rejet par metier"); + if (matrice==null){ + matrice=MatrixFactory.create(resultats.getMatrix(new PDate(0),pop ,"Rejet par metier")); + matrice.mults(0); + } + var temp=matrice.sumOverDim(0); + writeln("on a la matrice"); + for (var iiterateur=temp.iterator();iiterateur.next();){ + var coordonnees=iiterateur.getSemanticsCoordinates(); + var metier=coordonnees[1]; + var c=coordonnees[2]; + var z=coordonnees[3]; + capture=iiterateur.getValue(); + result+=pop.getNom()+";"+metier.getNom()+";"+c.getId()+";"+z.getNom()+";"+idate+";"+capture+"\n"; + } + } + } -writeln("fin de RejetsNombre"); -return ""+result; -*/ + writeln("fin de RejetsNombre"); + return ""+result; + */ } } Modified: trunk/exports/RejetsPoids.java =================================================================== --- trunk/exports/RejetsPoids.java 2009-04-28 13:29:04 UTC (rev 123) +++ trunk/exports/RejetsPoids.java 2009-04-28 13:31:17 UTC (rev 124) @@ -21,26 +21,24 @@ /** * RejetsPoids.java - * + * * Created: 23 novembre 2006 - * + * * @author anonymous <anonymous@labs.libre-entreprise.org> * @version $Revision: 1.4 $ - * - * Last update: $Date: 2007-05-24 09:30:07 $ - * by : $Author: bpoussin $ + * + * Last update: $Date: 2007-05-24 09:30:07 $ by : $Author: bpoussin $ */ - @Doc(value="do the doc of class RejetsPoids") +@Doc(value = "do the doc of class RejetsPoids") public class RejetsPoids implements Export { /** to use log facility, just put in your code: log.info("..."); */ static private Log log = LogFactory.getLog(RejetsPoids.class); - protected String [] necessaryResult = { - ResultName.MATRIX_DISCARDS_WEIGHT_PER_STR_MET_PER_ZONE_POP - + protected String[] necessaryResult = { ResultName.MATRIX_DISCARDS_WEIGHT_PER_STR_MET + }; - + public String[] getNecessaryResult() { return this.necessaryResult; } @@ -48,73 +46,78 @@ public String getExportFilename() { return "RejetsPoids"; } - + public String getExtensionFilename() { return ".csv"; } - + public String getDescription() { return _("Export les rejets en poids de la simulation. tableau pop;metier;id;zone;date;nombre"); } - public void export(SimulationStorage simulation, Writer out) throws Exception { - Date lastDate = simulation.getResultStorage().getLastDate(); - + public void export(SimulationStorage simulation, Writer out) + throws Exception { + Date lastDate = simulation.getResultStorage().getLastDate(); + for (Population pop : simulation.getParameter().getPopulations()) { - for (Date date = new Date(0); !date.after(lastDate); date = date.next() ) { - MatrixND mat = simulation.getResultStorage().getMatrix(date, pop, ResultName.MATRIX_DISCARDS_WEIGHT_PER_STR_MET_PER_ZONE_POP); + for (Date date = new Date(0); !date.after(lastDate); date = date + .next()) { + MatrixND mat = simulation.getResultStorage().getMatrix(date, + pop, ResultName.MATRIX_DISCARDS_WEIGHT_PER_STR_MET); if (mat != null) { // can be null if simulation is stopped before last year simulation mat = mat.sumOverDim(0); //sum on strategy - for (MatrixIterator i=mat.iterator(); i.hasNext();) { + for (MatrixIterator i = mat.iterator(); i.hasNext();) { i.next(); - Object [] sems = i.getSemanticsCoordinates(); - Metier metier = (Metier)sems[1]; - PopulationGroup group = (PopulationGroup)sems[2]; - Zone zone = (Zone)sems[3]; + Object[] sems = i.getSemanticsCoordinates(); + Metier metier = (Metier) sems[1]; + PopulationGroup group = (PopulationGroup) sems[2]; + Zone zone = (Zone) sems[3]; double val = i.getValue(); - out.write(pop.getName() +";"+ metier.getName() +";"+ group.getId() +";"+ zone.getName() +";"+ date.getDate() +";"+ val +"\n"); + out.write(pop.getName() + ";" + metier.getName() + ";" + + group.getId() + ";" + zone.getName() + ";" + + date.getDate() + ";" + val + "\n"); } } } } -/* -var Parametre=sim.getParametre(); -var Populations=Parametre.getPopulations(); -var PDate=Packages.fr.ifremer.nodb.Date; + /* + var Parametre=sim.getParametre(); + var Populations=Parametre.getPopulations(); + var PDate=Packages.fr.ifremer.nodb.Date; -var capture=0.0; -var result=""; -writeln("debut de export rejets poids"); -var dateexport=new Packages.java.util.Date(); -var formatteur= new Packages.java.text.SimpleDateFormat(); -writeln("heure de debut: "+formatteur.format(dateexport)); -var finsimu=resultats.getLastDate().getDate(); + var capture=0.0; + var result=""; + writeln("debut de export rejets poids"); + var dateexport=new Packages.java.util.Date(); + var formatteur= new Packages.java.text.SimpleDateFormat(); + writeln("heure de debut: "+formatteur.format(dateexport)); + var finsimu=resultats.getLastDate().getDate(); -for (var ipop=Populations.iterator();ipop.hasNext();){ - var pop=ipop.next(); - for (var idate=0;idate<=finsimu;idate++){ - var date=new PDate(idate); - var matrice=resultats.getMatrix(date, pop, "Rejet par metier"); - if (matrice==null){ - matrice=MatrixFactory.create(resultats.getMatrix(new PDate(0),pop ,"Rejet par metier")); - matrice.mults(0); - } - var temp=matrice.sumOverDim(0); - for (var iiterateur=temp.iterator();iiterateur.next();){ - var coordonnees=iiterateur.getSemanticsCoordinates(); - var metier=coordonnees[1]; - var c=coordonnees[2]; - var z=coordonnees[3]; - capture=iiterateur.getValue()*c.getPoidsMoyen(); - result+=pop.getNom()+";"+metier.getNom()+";"+c.getId()+";"+z.getNom()+";"+idate+";"+capture+"\n"; - } - } -} + for (var ipop=Populations.iterator();ipop.hasNext();){ + var pop=ipop.next(); + for (var idate=0;idate<=finsimu;idate++){ + var date=new PDate(idate); + var matrice=resultats.getMatrix(date, pop, "Rejet par metier"); + if (matrice==null){ + matrice=MatrixFactory.create(resultats.getMatrix(new PDate(0),pop ,"Rejet par metier")); + matrice.mults(0); + } + var temp=matrice.sumOverDim(0); + for (var iiterateur=temp.iterator();iiterateur.next();){ + var coordonnees=iiterateur.getSemanticsCoordinates(); + var metier=coordonnees[1]; + var c=coordonnees[2]; + var z=coordonnees[3]; + capture=iiterateur.getValue()*c.getPoidsMoyen(); + result+=pop.getNom()+";"+metier.getNom()+";"+c.getId()+";"+z.getNom()+";"+idate+";"+capture+"\n"; + } + } + } -writeln("fin de RejetsPoids"); -return ""+result; -*/ + writeln("fin de RejetsPoids"); + return ""+result; + */ } }