Menu
▾
▴
fudaa-cvs-commit — Mailing list for CVS commit messages
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
(89) |
Mar
(219) |
Apr
(82) |
May
(33) |
Jun
(11) |
Jul
(129) |
Aug
(357) |
Sep
(34) |
Oct
(37) |
Nov
(42) |
Dec
(182) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(59) |
Feb
(74) |
Mar
(196) |
Apr
(205) |
May
(109) |
Jun
(268) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <de...@us...> - 2004-03-08 12:54:22
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/telemac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3692/src/org/fudaa/dodico/test/telemac Modified Files: trigrid.geo Log Message: *** keyword substitution change *** |
|
From: <de...@us...> - 2004-03-05 15:44:49
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22693/src/org/fudaa/fudaa/tr Modified Files: TrImplementation.java Log Message: Maj commentaire Index: TrImplementation.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrImplementation.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** TrImplementation.java 12 Feb 2004 16:15:21 -0000 1.20 --- TrImplementation.java 5 Mar 2004 15:30:15 -0000 1.21 *************** *** 34,41 **** import javax.swing.SwingUtilities; - import org.fudaa.ctulu.CtuluLib; - import com.memoire.acme.AcmeGifEncoder; - import com.memoire.acme.AcmeJpegEncoder; import com.memoire.bu.BuBrowserPreferencesPanel; import com.memoire.bu.BuColumn; --- 34,38 ---- *************** *** 62,65 **** --- 59,63 ---- import com.memoire.bu.BuUserPreferencesPanel; + import org.fudaa.ctulu.CtuluLib; import org.fudaa.dodico.commun.ProgressionInterface; import org.fudaa.dodico.fichiers.FileFormat; *************** *** 72,76 **** import org.fudaa.dodico.h2d.type.H2dFileFormatType; import org.fudaa.dodico.telemac.io.TelemacDicoFileFormat; - import org.fudaa.ebli.calque.BArbreCalque; import org.fudaa.ebli.commun.EbliPreferences; --- 70,73 ---- *************** *** 79,83 **** import org.fudaa.ebli.impression.EbliMiseEnPagePreferencesPanel; import org.fudaa.ebli.ressource.EbliResource; - import org.fudaa.fudaa.commun.FudaaCommonImplementation; import org.fudaa.fudaa.commun.FudaaImportCsvPanel; --- 76,79 ---- *************** *** 98,101 **** --- 94,100 ---- extends FudaaCommonImplementation implements ItemListener { + /** + * Prefixe pour les commandes d'ouvertures + */ public final static String PREF_OUVRIR= "OUVRIR_"; BuGlassPaneStop glassPaneStop_; *************** *** 183,186 **** --- 182,188 ---- } + /** + * @return la console + */ public FollowApp getTailFrame() { if (tailFrame_ == null) *************** *** 188,191 **** --- 190,196 ---- return tailFrame_; } + /** + * Permet de changer le systeme utilise + */ public void changeChaineCalcul() { String[] choix= *************** *** 196,200 **** new BuDialogChoice( TrImplementation.this, ! TrImplementation.this.informationsSoftware(), TrResource.getS("Configuration chaîne de calcul"), TrResource.getS("Veuillez sélectionner la chaîne de calcul utilisée"), --- 201,205 ---- new BuDialogChoice( TrImplementation.this, ! TrImplementation.informationsSoftware(), TrResource.getS("Configuration chaîne de calcul"), TrResource.getS("Veuillez sélectionner la chaîne de calcul utilisée"), |
|
From: <de...@us...> - 2004-03-05 15:38:17
|
Update of /cvsroot/fudaa/fudaa_web/www_outils/xsl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21158/www_outils/xsl Modified Files: site.xsl Removed Files: site-base.xsl Log Message: MAj pour les liens vers le site du cetmef Index: site.xsl =================================================================== RCS file: /cvsroot/fudaa/fudaa_web/www_outils/xsl/site.xsl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** site.xsl 23 Jan 2004 13:24:55 -0000 1.3 --- site.xsl 5 Mar 2004 15:23:37 -0000 1.4 *************** *** 1,8 **** ! <?xml version="1.0" encoding="ISO-8859-1"?> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> ! <xsl:include href="site-base.xsl"/> ! <xsl:template match="xhtml"> <html> --- 1,12 ---- ! <?xml version="1.0" encoding="ISO-8859-1" standalone="no"?> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> ! <xsl:param name="destExt" select="'.html'"/> ! ! <xsl:param name="langue">fr</xsl:param> ! <xsl:param name="destExt" select="'.html'" /> ! <xsl:output method="xml" indent="yes" encoding="iso-8859-1" omit-xml-declaration="no" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" /> ! <xsl:template match="xhtml"> <html> *************** *** 127,130 **** --- 131,446 ---- </html> </xsl:template> + <!--Permet de recopier les balises --> + <xsl:template match="node()|@*"> + <xsl:copy> + <xsl:apply-templates select="node()|@*"/> + </xsl:copy> + </xsl:template> + + + + <xsl:template match="head|header|footer|document|document-header|document-footer|right|right-footer|right-header| left|left-footer|left-header|item-label|menu-item-decoration| sous-menu-item-decoration|item-titre|menu-item-selectionne-decoration| sous-menu-item-selectionne-decoration"> + <xsl:apply-templates/> + </xsl:template> + + <xsl:template match="img[@class='zoom']"> + + <xsl:variable name="ext"> + <xsl:call-template name="get-ext"> + <xsl:with-param name="source"> + <xsl:value-of select="@src"/> + </xsl:with-param> + </xsl:call-template> + </xsl:variable> + + <xsl:variable name="sans-ext"> + <xsl:call-template name="get-sans-ext"> + <xsl:with-param name="source"> + <xsl:value-of select="@src"/> + </xsl:with-param> + </xsl:call-template> + </xsl:variable> + + <xsl:variable name="fichier"> + <xsl:call-template name="get-fichier"> + <xsl:with-param name="source"> + <xsl:value-of select="@src"/> + </xsl:with-param> + </xsl:call-template> + </xsl:variable> + <a title="zoom"> + <xsl:attribute name="href"> + <xsl:value-of select="$sans-ext"/>-zoom.<xsl:value-of select="$ext"/> + </xsl:attribute> + <img class="img-zoom"> + <xsl:for-each select="@*"> + <xsl:copy/> + </xsl:for-each> + </img> + </a> + </xsl:template> + + + <xsl:template match="note"> + <div class="centerH"> + <div class="note"> + <xsl:apply-templates/> + </div> </div> + </xsl:template> + + <xsl:template match="auteur"> + <div id="div-auteur"> + <xsl:apply-templates select="text()"/> + </div> + </xsl:template> + + <xsl:template match="date"> + <div id="div-date"> + <xsl:apply-templates select="text()"/> + </div> + </xsl:template> + + <xsl:template match="resume"> + <div id="div-resume"> + <xsl:apply-templates select="text()"/> + </div> + </xsl:template> + + <xsl:template match="ordre"></xsl:template> + + <xsl:template match="menu-"> + <table class="menu"> + <xsl:apply-templates select="menu-item"/> + </table> + </xsl:template> + + <xsl:template match="sous-menu"> + <table class="sous-menu"> + <xsl:apply-templates select="menu-item"/> + </table> + </xsl:template> + + <xsl:template match="menu-item"> + <xsl:variable name="menu-item-id"> + <xsl:value-of select="@id"/> + </xsl:variable> + <xsl:variable name="selectionne"> + <xsl:for-each select="//menu-item-selectionne"> + <xsl:if test="@item-ref=$menu-item-id"> + <xsl:text>vrai</xsl:text> + </xsl:if> + </xsl:for-each> + </xsl:variable> + <tr> + <td> + <xsl:choose> + <xsl:when test="$selectionne='vrai'"> + <xsl:attribute name="class">menu-item-selectionne</xsl:attribute> + </xsl:when> + <xsl:otherwise> + <xsl:attribute name="class">menu-item</xsl:attribute> + </xsl:otherwise> + </xsl:choose> + <xsl:choose> + <xsl:when test="../menu-item-decoration"> + <xsl:choose> + <xsl:when test="$selectionne='vrai'"> + <xsl:apply-templates select="../menu-item-selectionne-decoration"/> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="../menu-item-decoration"/> + </xsl:otherwise> + </xsl:choose> + </xsl:when> + <xsl:otherwise> + <xsl:choose> + <xsl:when test="$selectionne='vrai'"> + <xsl:apply-templates select="//menu-/sous-menu-item-selectionne-decoration"/> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="//menu-/sous-menu-item-decoration"/> + </xsl:otherwise> + </xsl:choose> + </xsl:otherwise> + </xsl:choose> + </td> + <td> + <xsl:choose> + <xsl:when test="$selectionne='vrai'"> + <xsl:attribute name="class">menu-item-selectionne</xsl:attribute> + </xsl:when> + <xsl:otherwise> + <xsl:attribute name="class">menu-item</xsl:attribute> + </xsl:otherwise> + </xsl:choose> + <a> + <xsl:attribute name="href"> + <xsl:value-of select="@href"/> + </xsl:attribute> + <xsl:if test="item-titre"> + <xsl:attribute name="title"> + <xsl:apply-templates select="item-titre"/> + </xsl:attribute> + </xsl:if> + <xsl:apply-templates select="item-label"/> + </a> + </td> + </tr> + <xsl:if test="(sous-menu)"> + <tr> + <td> </td> + <td> + <xsl:apply-templates select="sous-menu"/> + </td> + </tr> + </xsl:if> + </xsl:template> + + <xsl:template name="item-label-selectionne"> + <xsl:param name="level"/> + <xsl:variable name="item-id"> + <xsl:value-of select="//menu-item-selectionne[$level]/@item-ref"/> + </xsl:variable> + <xsl:apply-templates/> + </xsl:template> + + <xsl:template name="get-fichier"> + <xsl:param name="source"/> + <xsl:choose> + <xsl:when test="contains($source, '/')"> + <xsl:call-template name="get-fichier"> + <xsl:with-param name="source"> + <xsl:value-of select="substring-after($source, '/')"/> + </xsl:with-param> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$source"/> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + + <xsl:template name="get-ext"> + <xsl:param name="source"/> + <xsl:param name="prem">vrai</xsl:param> + <xsl:choose> + <xsl:when test="$prem='vrai'"> + <xsl:variable name="fichier"> + <xsl:call-template name="get-fichier"> + <xsl:with-param name="source"> + <xsl:value-of select="$source"/> + </xsl:with-param> + </xsl:call-template> + </xsl:variable> + <xsl:choose> + <xsl:when test="starts-with($fichier, '.')"> + <xsl:variable name="source"> + <xsl:value-of select="substring($fichier, 2)"/> + </xsl:variable> + <xsl:call-template name="get-ext"> + <xsl:with-param name="source"> + <xsl:value-of select="$source"/> + </xsl:with-param> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="get-ext"> + <xsl:with-param name="source"> + <xsl:value-of select="substring-after($fichier, '.')"/> + </xsl:with-param> + <xsl:with-param name="prem">faux</xsl:with-param> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> + </xsl:when> + <xsl:otherwise> + <xsl:variable name="resultat"> + <xsl:value-of select="substring-after($source, '.')"/> + </xsl:variable> + <xsl:choose> + <xsl:when test="string-length($resultat)=0"> + <xsl:value-of select="$source"/> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="get-ext"> + <xsl:with-param name="source"> + <xsl:value-of select="$resultat"/> + </xsl:with-param> + <xsl:with-param name="prem">faux</xsl:with-param> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + + <xsl:template name="get-sans-ext"> + <xsl:param name="source"/> + <xsl:variable name="ext"> + <xsl:call-template name="get-ext"> + <xsl:with-param name="source"> + <xsl:value-of select="$source"/> + </xsl:with-param> + </xsl:call-template> + </xsl:variable> + <xsl:variable name="taille"> + <xsl:value-of select="string-length($source)-string-length($ext)"/> + </xsl:variable> + <xsl:value-of select="substring($source,0,$taille)"/> + </xsl:template> + + <!--les balises du style <div class="table-sommaire"> contiennent, tout le temps, + des liens vers des fichiers sous la forme + <a href="/path/absolu/vers/le/fichier">lefichier</a>. Ces liens sont + générés par par la tache ant "filelist" et sont contenus dans les fichier + de type file.lst + Lister les fichiers d'un dossier en evitant le fichier index--> + <xsl:template match="div[@class='table-sommaire']"> + <div class="centerH"> + <table class="sommaire"> + <tr><th>Titre</th><th>Résumé</th><th>Date</th></tr> + <xsl:for-each select=".//a"> + <xsl:sort select="document(@href)//h1[1]"/> + <xsl:if test="not(contains(text(),'index')) and contains(text(),'.xml')"> + <xsl:variable name="content" select="document(@href)"/> + <tr> + <td class="table-sommaire-titre"> + <a href="{concat(substring-before(text(),'.xml'),$destExt)}"> + <xsl:value-of select="$content//h1[1]"/></a> + </td> + <td> + <xsl:value-of select="$content//resume"/></td> + <td class="table-sommaire-date"> + <xsl:value-of select="$content//date"/> + </td> + </tr> + </xsl:if> + </xsl:for-each> + </table> + </div> + </xsl:template> + + <xsl:template match="div[@class='table-sommaire-simple']"> + <div class="centerH"> + <table class="sommaire"> + <tr><th>Nom</th><th>Résumé</th></tr> + <xsl:for-each select=".//a"> + <xsl:sort select="document(@href)//h1[1]"/> + <xsl:if test="not(contains(text(),'index')) and contains(text(),'.xml')"> + <xsl:variable name="content" select="document(@href)"/> + <tr> + <td class="table-sommaire-titre"> + <a href="{concat(substring-before(text(),'.xml'),$destExt)}"> + <xsl:value-of select="$content//h1[1]"/></a> + </td> + <td> + <xsl:value-of select="$content//resume"/></td> + </tr> + </xsl:if> + </xsl:for-each> + </table> + </div> + </xsl:template> + </xsl:stylesheet> --- site-base.xsl DELETED --- |
|
From: <de...@us...> - 2004-03-05 15:38:15
|
Update of /cvsroot/fudaa/fudaa_web In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21158 Modified Files: build.xml Log Message: MAj pour les liens vers le site du cetmef Index: build.xml =================================================================== RCS file: /cvsroot/fudaa/fudaa_web/build.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** build.xml 4 Mar 2004 18:19:06 -0000 1.4 --- build.xml 5 Mar 2004 15:23:34 -0000 1.5 *************** *** 22,26 **** <property file="ant.default.properties"/> ! <property name="build.compiler" value="jikes"/> <property name="build.dir" location="build/"/> <property name="dist.dir" location="dist/"/> --- 22,26 ---- <property file="ant.default.properties"/> ! <property name="build.dir" location="build/"/> <property name="dist.dir" location="dist/"/> |
|
From: <de...@us...> - 2004-03-05 15:37:53
|
Update of /cvsroot/fudaa/fudaa_web/www_outils/dtd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21158/www_outils/dtd Modified Files: donnees-cetmef.dtd Log Message: MAj pour les liens vers le site du cetmef Index: donnees-cetmef.dtd =================================================================== RCS file: /cvsroot/fudaa/fudaa_web/www_outils/dtd/donnees-cetmef.dtd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** donnees-cetmef.dtd 4 Mar 2004 18:02:02 -0000 1.3 --- donnees-cetmef.dtd 5 Mar 2004 15:23:42 -0000 1.4 *************** *** 28,76 **** <!ENTITY fudaa-cvs-sf-url "http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/fudaa/"> - <!ENTITY fudaa-org-url "http://www.fudaa.org/site/"> - <!ENTITY fudaa-org-local-url "&marina-fudaa-url;site/"> - - - <!ENTITY utc-url "http://www.utc.fr/fudaa/"> ! <!ENTITY dimduc-responsable-name "Manuel Le Moine"> ! <!ENTITY dimduc-responsable-mail "man...@eq..."> <!ENTITY dimduc-url "&utc-url;dimduc/"> - <!ENTITY dimduc-local-url "&marina-fudaa-url;dimduc/"> - <!ENTITY lido-responsable-name "Stéphane Ladreyt"> <!ENTITY lido-responsable-mail "cee...@eq..."> ! <!ENTITY lido-path "projets/hydraulique/clubcourseau/bandeau.html"> ! <!ENTITY lido-local-url "&cetmef-local-url;&lido-path;"> ! <!ENTITY lido-url "&cetmef-url;&lido-path;"> ! <!ENTITY refonde-responsable-name "Pierre Debaillon"> <!ENTITY refonde-responsable-mail "pie...@eq..."> ! <!ENTITY refonde-url "http://www.cetmef.equipement.gouv.fr/projets/hydraulique/refonde/bandeau.html"> ! <!ENTITY refonde-local-url "&marina-fudaa-url;refonde/"> <!ENTITY vag-responsable-name "Patrick Gomi"> <!ENTITY vag-responsable-mail "pat...@eq..."> ! <!ENTITY vag-url "&utc-url;vag/"> ! <!ENTITY vag-local-url "&marina-fudaa-url;vag/"> <!ENTITY reflux-responsable-name "Patrick Gomi"> <!ENTITY reflux-responsable-mail "pat...@eq..."> - <!ENTITY reflux-local-url "&marina-fudaa-url;reflux/"> <!ENTITY reflux-url "&cetmef-url;projets/hydraulique/reflux/bandeau.html"> <!ENTITY simnav-url "http://www.utc.fr/simnav/"> - <!ENTITY simnav-local-url "&marina-url;simnav/"> - - <!ENTITY java-documentation-local-url "/doc/java/"> <!ENTITY java-documentation-url "http://java.sun.com/docs/"> - - <!ENTITY java-api-local-url "/api/"> <!ENTITY java-api-url "http://java.sun.com/j2se/1.3/docs/api/"> - - <!ENTITY fudaa-api-local-url "/apiFudaa/"> - --- 28,58 ---- <!ENTITY fudaa-cvs-sf-url "http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/fudaa/"> <!ENTITY utc-url "http://www.utc.fr/fudaa/"> ! <!ENTITY dimduc-responsable-name "?"> ! <!ENTITY dimduc-responsable-mail "?"> <!ENTITY dimduc-url "&utc-url;dimduc/"> <!ENTITY lido-responsable-name "Stéphane Ladreyt"> <!ENTITY lido-responsable-mail "cee...@eq..."> ! <!ENTITY lido-url "&cetmef-url;projets/hydraulique/clubcourseau/bandeau.html"> ! <!ENTITY lido-download "&cetmef-url;logiciels/telechargement/lido/formulaire.php"> <!ENTITY refonde-responsable-name "Pierre Debaillon"> <!ENTITY refonde-responsable-mail "pie...@eq..."> ! <!ENTITY refonde-url "&cetmef-url;projets/hydraulique/refonde/bandeau.html"> ! <!ENTITY refonde-download "&cetmef-url;logiciels/telechargement/refonde/formulaire.php"> <!ENTITY vag-responsable-name "Patrick Gomi"> <!ENTITY vag-responsable-mail "pat...@eq..."> ! <!ENTITY vag-url "&cetmef-url;projets/hydraulique/vag/bandeau.html"> ! <!ENTITY vag-download "&cetmef-url;logiciels/telechargement/vag/formulaire.php"> <!ENTITY reflux-responsable-name "Patrick Gomi"> <!ENTITY reflux-responsable-mail "pat...@eq..."> <!ENTITY reflux-url "&cetmef-url;projets/hydraulique/reflux/bandeau.html"> <!ENTITY simnav-url "http://www.utc.fr/simnav/"> <!ENTITY java-documentation-url "http://java.sun.com/docs/"> <!ENTITY java-api-url "http://java.sun.com/j2se/1.3/docs/api/"> |
|
From: <de...@us...> - 2004-03-05 15:37:53
|
Update of /cvsroot/fudaa/fudaa_web/src/style In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21158/src/style Modified Files: default.css Log Message: MAj pour les liens vers le site du cetmef Index: default.css =================================================================== RCS file: /cvsroot/fudaa/fudaa_web/src/style/default.css,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** default.css 4 Mar 2004 18:19:07 -0000 1.3 --- default.css 5 Mar 2004 15:23:40 -0000 1.4 *************** *** 133,136 **** --- 133,139 ---- text-align : center; } + .important { + font-weight : bold; + } p.important { font-weight : bold; *************** *** 337,341 **** /******************************************************************************/ /*************** special ******************************************************/ ! table.note { margin-top : 20px; margin-bottom : 20px; --- 340,344 ---- /******************************************************************************/ /*************** special ******************************************************/ ! div.note { margin-top : 20px; margin-bottom : 20px; *************** *** 343,347 **** margin-right:auto; width : 75%; ! text-align : center; } --- 346,351 ---- margin-right:auto; width : 75%; ! text-align : justify; ! color : #666666; } |
|
From: <de...@us...> - 2004-03-05 15:37:53
|
Update of /cvsroot/fudaa/fudaa_web/www_outils/ant In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21158/www_outils/ant Modified Files: FileList.java Log Message: MAj pour les liens vers le site du cetmef Index: FileList.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_web/www_outils/ant/FileList.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FileList.java 23 Jan 2004 12:26:00 -0000 1.1 --- FileList.java 5 Mar 2004 15:23:41 -0000 1.2 *************** *** 1,4 **** --- 1,5 ---- import java.util.*; import java.io.*; + import java.net.*; import java.util.Iterator; *************** *** 22,25 **** --- 23,27 ---- s.setExcludes(new String[] { file }); s.addDefaultExcludes(); + try{ for (int i= filesets.size() - 1; i >= 0; i--) { DirSet fs= (DirSet)filesets.elementAt(i); *************** *** 27,37 **** File fromDir= fs.getDir(project); String[] dirFiles= ds.getIncludedDirectories(); for (int j= dirFiles.length - 1; j >= 0; j--) { File destFile= new File(fromDir, dirFiles[j]); s.setBasedir(destFile); s.scan(); ! writeListFile(destFile, s.getIncludedFiles(),fs.getDir(project).getAbsolutePath()); } } } --- 29,44 ---- File fromDir= fs.getDir(project); String[] dirFiles= ds.getIncludedDirectories(); + for (int j= dirFiles.length - 1; j >= 0; j--) { File destFile= new File(fromDir, dirFiles[j]); s.setBasedir(destFile); s.scan(); ! writeListFile(destFile, s.getIncludedFiles(),fs.getDir(project).getAbsoluteFile().toURL().toString()); } } + } + catch(MalformedURLException e){ + e.printStackTrace(); + } } *************** *** 57,66 **** out.write("<div>"); for (int j= filenames.length - 1; j >= 0; j--) { ! String absPath=new File(destDir, filenames[j]).getAbsolutePath(); out.write( "<a href=\"" + absPath + "\">" ! + "&url;"+absPath.substring(_baseDir.length()+1) + "</a>\n"); } --- 64,73 ---- out.write("<div>"); for (int j= filenames.length - 1; j >= 0; j--) { ! String absPath=new File(destDir, filenames[j]).toURL().toString(); out.write( "<a href=\"" + absPath + "\">" ! + "&url;"+absPath.substring(_baseDir.length()) + "</a>\n"); } |
|
From: <de...@us...> - 2004-03-05 15:37:52
|
Update of /cvsroot/fudaa/fudaa_web/include_xml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21158/include_xml Modified Files: devel.xml Log Message: MAj pour les liens vers le site du cetmef Index: devel.xml =================================================================== RCS file: /cvsroot/fudaa/fudaa_web/include_xml/devel.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** devel.xml 23 Jan 2004 12:00:04 -0000 1.1 --- devel.xml 5 Mar 2004 15:23:42 -0000 1.2 *************** *** 1,2 **** --- 1,3 ---- + <?xml version="1.0" encoding="ISO-8859-1"?> &head; &header-footer; *************** *** 11,14 **** --- 12,16 ---- <tr><td><a href="&url;devel/liens.html">liens</a></td></tr> <tr><td><a href="&url;devel/telechargement/index.html">télécharger</a></td></tr> + <tr><td><a href="http://fudaa.sf.net/check/">Contrôle des sources</a></td></tr> <tr><td><a href="&fudaa-devel-cvs;">CVS</a></td></tr> |
|
From: <de...@us...> - 2004-03-05 15:37:52
|
Update of /cvsroot/fudaa/fudaa_web/src/applications In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21158/src/applications Modified Files: vag.xml lido.xml refonde.xml Log Message: MAj pour les liens vers le site du cetmef Index: vag.xml =================================================================== RCS file: /cvsroot/fudaa/fudaa_web/src/applications/vag.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** vag.xml 4 Mar 2004 18:19:07 -0000 1.2 --- vag.xml 5 Mar 2004 15:23:37 -0000 1.3 *************** *** 31,35 **** <h2>Téléchargement</h2> <p> ! <a href="http://www.cetmef.equipement.gouv.fr/logiciels/telechargement/vag/formulaire.php">Télécharger </a></p> --- 31,35 ---- <h2>Téléchargement</h2> <p> ! <a href="&vag-download;">Télécharger </a></p> Index: lido.xml =================================================================== RCS file: /cvsroot/fudaa/fudaa_web/src/applications/lido.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lido.xml 23 Jan 2004 12:04:45 -0000 1.1 --- lido.xml 5 Mar 2004 15:23:40 -0000 1.2 *************** *** 21,25 **** </p> <h2>Site internet</h2> ! <p><a href="&cetmef-url;/&lido-path;">&lido-url;</a></p> <h2>Responsable</h2> <ul><li>&lido-responsable-name;</li> --- 21,25 ---- </p> <h2>Site internet</h2> ! <p><a href="&lido-url;">&lido-url;</a></p> <h2>Responsable</h2> <ul><li>&lido-responsable-name;</li> *************** *** 31,36 **** Ministère de l'Equipement.</p> <h2>Téléchargement</h2> ! <p><a href="http://www.utc.fr/fudaa/distrib/lido/" > ! http://www.utc.fr/fudaa/distrib/lido/</a></p> </document> --- 31,36 ---- Ministère de l'Equipement.</p> <h2>Téléchargement</h2> ! <p><a href="&lido-download;" > ! télécharger ( formulaire)</a></p> </document> Index: refonde.xml =================================================================== RCS file: /cvsroot/fudaa/fudaa_web/src/applications/refonde.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** refonde.xml 4 Mar 2004 18:19:07 -0000 1.2 --- refonde.xml 5 Mar 2004 15:23:40 -0000 1.3 *************** *** 29,34 **** <h2>Téléchargement</h2> <p> ! <a href="http://www.cetmef.equipement.gouv.fr/logiciels/telechargement/refonde/formulaire.php" > ! Télécharger </a></p> </document> --- 29,34 ---- <h2>Téléchargement</h2> <p> ! <a href="&refonde-download;" > ! formulaire </a></p> </document> |
|
From: <de...@us...> - 2004-03-05 15:37:52
|
Update of /cvsroot/fudaa/fudaa_web/src/devel/documents In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21158/src/devel/documents Added Files: testUnitaires.xml checksource.xml depdances.xml Log Message: MAj pour les liens vers le site du cetmef --- NEW FILE: testUnitaires.xml --- <?xml version="1.0" encoding="ISO-8859-1" standalone="no"?> <!DOCTYPE xhtml SYSTEM "../devel.dtd"[ <!ENTITY url "./../../"> ]> <!--$id$--><xhtml> &devel-default; <document> <auteur>@cvs@$Author: deniger $@cvs@</auteur> <date>2004-03-05</date> <resume>Rapport des tests unitaires effectués.</resume> <h1>Tests unitaires</h1> <note> Ce document est un compte-rendu des tests unitaires effectués sur fudaa. Il est régulièrement mis à jour (il est généré par une tâche ant): voir <a href="http://fudaa.sf.net/check/">http://fudaa.sf.net/check/</a>. </note> <div class="centerH"> <a href="http://fudaa.sf.net/check/junit/">Résultats des tests unitaires</a> </div> </document> </xhtml> --- NEW FILE: checksource.xml --- <?xml version="1.0" encoding="ISO-8859-1" standalone="no"?> <!DOCTYPE xhtml SYSTEM "../devel.dtd"[ <!ENTITY url "./../../"> ]> <!--$id$--><xhtml> &devel-default; <document> <auteur>@cvs@$Author: deniger $@cvs@</auteur> <date>2004-03-05</date> <resume>Ce document liste toutes les erreurs de style rencontrées dans fudaa.</resume> <h1>Contrôles des sources</h1> <note> Ce document liste toutes les erreurs de style rencontrées dans fudaa. Les détails des contrôles sont rassemblés dans un fichier xml. Il est régulièrement mis à jour (il est généré par une tâche ant): voir <a href="http://fudaa.sf.net/check/">http://fudaa.sf.net/check/</a>. </note> <div class="centerH"> <a href="http://fudaa.sf.net/check/style/">Voir les résultats des contrôles</a> </div> </document> </xhtml> --- NEW FILE: depdances.xml --- <?xml version="1.0" encoding="ISO-8859-1" standalone="no"?> <!DOCTYPE xhtml SYSTEM "../devel.dtd"[ <!ENTITY url "./../../"> ]> <!--$id$--><xhtml> &devel-default; <document> <auteur>@cvs@$Author: deniger $@cvs@</auteur> <date>2004-03-05</date> <resume>Donne les dépendances entre les paquetages de fudaa.</resume> <h1>Dépendances</h1> <note> Ce document décrit les dépendances entre les paquetages de fudaa. Il est régulièrement mis à jour (il est généré par une tâche ant): voir <a href="http://fudaa.sf.net/check/">http://fudaa.sf.net/check/</a>. </note> <div class="centerH"> <a href="http://fudaa.sf.net/check/depend/">Voir les dépendances</a> </div> </document> </xhtml> |
|
From: <de...@us...> - 2004-03-05 15:37:51
|
Update of /cvsroot/fudaa/fudaa_web/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21158/src Modified Files: index.xml Log Message: MAj pour les liens vers le site du cetmef Index: index.xml =================================================================== RCS file: /cvsroot/fudaa/fudaa_web/src/index.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** index.xml 4 Mar 2004 18:19:07 -0000 1.2 --- index.xml 5 Mar 2004 15:23:41 -0000 1.3 *************** *** 42,45 **** --- 42,57 ---- <tr> <th> + <a href="http://fudaa.sf.net/check/">[Page web] Suivi du projet fudaa</a> + </th> + </tr> + <tr> + <td> + <p>[2004-03-05] + Cette nouvelle page rassemble des rapports : contrôle des sources, tests unitaires, dépendances + </p> + </td> + </tr> + <tr> + <th> <a href="devel/ebli/documents/news200311.html">[Document] Nouveautés du projet ebli</a> </th> |
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/h2d In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19764/src/org/fudaa/dodico/test/h2d Modified Files: TestTransformationCorEleBthSerafin.java Added Files: TestJBord.java TestJMaillage.java Removed Files: TestBord.java TestMaillage.java Log Message: Renommer les fichiers Test en TestJ --- NEW FILE: TestJBord.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: TestJMaillage.java --- /* * @file TestMaillage.java * @creation 3 juil. 2003 * @modification $Date: 2004/03/05 15:18:25 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail fud...@li... */ package org.fudaa.dodico.test.h2d; import gnu.trove.TDoubleArrayList; import gnu.trove.TIntArrayList; import gnu.trove.TIntIntHashMap; import gnu.trove.TObjectIntHashMap; import java.util.ArrayList; import java.util.Arrays; import junit.framework.TestCase; import org.fudaa.ctulu.CtuluGeometrie; import org.fudaa.dodico.commun.DodicoAnalyze; import org.fudaa.dodico.commun.ProgressionTestAdapter; import org.fudaa.dodico.ef.EfElement; import org.fudaa.dodico.ef.EfFrontier; import org.fudaa.dodico.ef.EfGrid; import org.fudaa.dodico.ef.EfInterpolationGrid; import org.fudaa.dodico.ef.EfLib; import org.fudaa.dodico.ef.EfNode; import org.fudaa.dodico.ef.EfdSegment; import org.fudaa.dodico.interpolateur.Interpolateur; import org.fudaa.dodico.interpolateur.InterpolationNearestNeighborRef; /** * 8 * / | \ * / 7|8 \ * / | \ * 7-- 5---- 6 * |5/ |\ 4 / / * |/3 |T\ / 6/ * 4-- 2-- 3 / * |2/ \1| / * |/ O \|/ * 0----- 1 * Test pour le maillage ci-dessus (T pour trou). * @author deniger * @version $Id: TestJMaillage.java,v 1.1 2004/03/05 15:18:25 deniger Exp $ */ public class TestJMaillage extends TestCase { EfGrid mail_; double eps_; ProgressionTestAdapter progress_; /** * */ public TestJMaillage() { progress_= null; eps_= 1E-15; } public void testAireTriangle() { double x1= 0; double y1= 0; double x2= 5; double y2= 0; double x3= 0; double y3= 5; assertEquals( 12.5, CtuluGeometrie.aireTriangle(x1, y1, x2, y2, x3, y3), eps_); x3= -15; assertEquals( 12.5, CtuluGeometrie.aireTriangle(x1, y1, x2, y2, x3, y3), eps_); x3= 15; y3= -5; assertEquals( 12.5, CtuluGeometrie.aireTriangle(x1, y1, x2, y2, x3, y3), eps_); initMaillage(); int[] l= mail_.getSmallElement(null, 1); assertNotNull(l); assertEquals(3, l.length); Arrays.sort(l); assertEquals(2, l[0]); assertEquals(3, l[1]); assertEquals(5, l[2]); l= mail_.getSmallElement(null, 0.95); assertNull(l); initMaillageT6(); l= mail_.getSmallElement(null, 1); assertNotNull(l); assertEquals(3, l.length); Arrays.sort(l); assertEquals(2, l[0]); assertEquals(3, l[1]); assertEquals(5, l[2]); l= mail_.getSmallElement(null, 0.95); assertNull(l); } public static EfGrid createMaillage() { EfNode[] pts= new EfNode[9]; pts[0]= new EfNode(0, 0, 15); pts[1]= new EfNode(2, -1, -15); pts[2]= new EfNode(1, 2, -5); pts[3]= new EfNode(2, 2, 30); pts[4]= new EfNode(0, 2, 30); pts[5]= new EfNode(1, 4, 30); pts[6]= new EfNode(10, 11, 30); pts[7]= new EfNode(0, 4, 30); pts[8]= new EfNode(2, 20, 30); EfElement[] elt= new EfElement[9]; elt[0]= new EfElement(new int[] { 0, 2, 1 }); elt[1]= new EfElement(new int[] { 1, 2, 3 }); elt[2]= new EfElement(new int[] { 0, 4, 2 }); elt[3]= new EfElement(new int[] { 4, 5, 2 }); elt[4]= new EfElement(new int[] { 5, 6, 3 }); elt[5]= new EfElement(new int[] { 5, 4, 7 }); elt[6]= new EfElement(new int[] { 1, 3, 6 }); elt[7]= new EfElement(new int[] { 7, 8, 5 }); elt[8]= new EfElement(new int[] { 6, 5, 8 }); EfGrid r= new EfGrid(pts, elt); return r; } private void initMaillage() { mail_= createMaillage(); } private void initMaillageT6() { mail_= createMaillageT6(); } public static EfGrid createMaillageT6() { EfNode[] pts= new EfNode[27]; pts[0]= new EfNode(0, 0, 15); pts[1]= new EfNode(2, -1, -15); pts[2]= new EfNode(1, 2, -5); pts[3]= new EfNode(2, 2, 30); pts[4]= new EfNode(0, 2, 30); pts[5]= new EfNode(1, 4, 30); pts[6]= new EfNode(10, 11, 30); pts[7]= new EfNode(0, 4, 30); pts[8]= new EfNode(2, 20, 30); //elt 0 pts[9]= EfNode.createMilieu(pts[0], pts[2]); pts[10]= EfNode.createMilieu(pts[2], pts[1]); pts[11]= EfNode.createMilieu(pts[1], pts[0]); //elt 1 pts[12]= EfNode.createMilieu(pts[2], pts[3]); pts[13]= EfNode.createMilieu(pts[1], pts[3]); //pts10 //elt 2 pts[14]= EfNode.createMilieu(pts[0], pts[4]); pts[15]= EfNode.createMilieu(pts[4], pts[2]); //pts 9 // elt 3 pts[16]= EfNode.createMilieu(pts[5], pts[4]); pts[17]= EfNode.createMilieu(pts[5], pts[2]); //pts 15 // elt 4 pts[18]= EfNode.createMilieu(pts[5], pts[6]); pts[19]= EfNode.createMilieu(pts[3], pts[6]); pts[20]= EfNode.createMilieu(pts[5], pts[3]); // elt 5 pts[21]= EfNode.createMilieu(pts[4], pts[7]); pts[22]= EfNode.createMilieu(pts[5], pts[7]); //pts 16 // elt 6 //pts12 //pts19 pts[23]= EfNode.createMilieu(pts[6], pts[1]); // elt 7 pts[24]= EfNode.createMilieu(pts[7], pts[8]); pts[25]= EfNode.createMilieu(pts[8], pts[5]); //pts 21 // elt 8 pts[26]= EfNode.createMilieu(pts[6], pts[8]); //Pts 25 //pts 20 EfElement[] elt= new EfElement[9]; elt[0]= new EfElement(new int[] { 0, 9, 2, 10, 1, 11 }); elt[1]= new EfElement(new int[] { 1, 10, 2, 12, 3, 13 }); elt[2]= new EfElement(new int[] { 0, 14, 4, 15, 2, 9 }); elt[3]= new EfElement(new int[] { 4, 16, 5, 17, 2, 15 }); elt[4]= new EfElement(new int[] { 5, 18, 6, 19, 3, 20 }); elt[5]= new EfElement(new int[] { 5, 16, 4, 21, 7, 22 }); elt[6]= new EfElement(new int[] { 1, 13, 3, 19, 6, 23 }); elt[7]= new EfElement(new int[] { 7, 24, 8, 25, 5, 22 }); elt[8]= new EfElement(new int[] { 6, 18, 5, 25, 8, 26 }); EfGrid r= new EfGrid(pts, elt); return r; } public void testTrigo() { initMaillage(); EfElement el= mail_.getElement(0); assertEquals(el.getPtIndex(0), 0); assertEquals(el.getPtIndex(1), 2); assertEquals(el.getPtIndex(2), 1); el= mail_.getElement(1); assertEquals(el.getPtIndex(0), 1); assertEquals(el.getPtIndex(1), 2); assertEquals(el.getPtIndex(2), 3); assertEquals(mail_.isElementTrigoOriente(0), -1); assertEquals(mail_.isElementTrigoOriente(1), -1); assertEquals(el.isSegmentInEltOrient(1, 3), -1); assertEquals(el.isSegmentInEltOrient(3, 2), -1); assertEquals(el.isSegmentInEltOrient(2, 1), -1); assertEquals(el.isSegmentInEltOrient(2, 3), 1); assertEquals(el.isSegmentInEltOrient(2, 2), 0); double d= el.getAngle(mail_, 2) * 180 / Math.PI; assertEquals(90, d, eps_); d= el.getAngle(mail_, 0) * 180 / Math.PI; assertEquals(18.4349, d, 1e-3); d= el.getAngle(mail_, 1) * 180 / Math.PI; assertEquals(90 - 18.4349, d, 1e-3); } public void testOverstressed() { initMaillage(); int[] overI= mail_.getOverstressedElement(null); assertNotNull(overI); assertEquals(9, overI.length); EfElement[] nElt= new EfElement[mail_.getEltNb() + 1]; for (int i= 0; i < mail_.getEltNb(); i++) { nElt[i]= new EfElement(mail_.getElement(i)); } nElt[mail_.getEltNb()]= new EfElement(new int[] { 2, 3, 5 }); EfNode[] nPt= new EfNode[mail_.getPtsNb() + 1]; for (int i= 0; i < mail_.getPtsNb(); i++) { nPt[i]= new EfNode(mail_.getPt(i)); } EfGrid n= new EfGrid(nPt, nElt); EfLib.orienteGrid(n, null, true, null); n.computeBord(null); assertNull(n.getOverstressedElement(null)); } public void testContains() { initMaillage(); mail_.computeBord(null); // Polygon l=new Polygon(); // // for(int i=mail_.getFrontiers().getNbPt(0)-1;i>=0;i--){ // l.addPoint((int)mail_.getPointOnFrontierExtern(i).getX(), // (int)mail_.getPointOnFrontierExtern(i).getY()); // } // for(int i=mail_.getFrontiers().getNbPt(0)-1;i>=0;i--){ // assertTrue(l.contains(mail_.getPointOnFrontierExtern(i).getX(),mail_.getPointOnFrontierExtern(i).getY())); // } // System.out.println("POLYGON OK"); for (int i= mail_.getFrontiers().getNbPt(0) - 1; i >= 0; i--) { assertTrue(mail_.contientPoint(mail_.getPointOnFrontierExtern(i))); } assertFalse(mail_.contientPoint(0, 5)); assertFalse(mail_.contientPoint(2.1, 20)); assertTrue(mail_.contientPoint(1, 12)); assertEquals(1, mail_.getDistanceFromFrontier(-1, 1), eps_); assertEquals(1, mail_.getDistanceFromFrontier(1, 1), eps_); assertEquals(0, mail_.getDistanceFromFrontier(1, -0.5), eps_); } public void testTrigoT6() { initMaillageT6(); EfElement el= mail_.getElement(0); assertEquals(el.getPtIndex(0), 0); assertEquals(el.getPtIndex(1), 9); assertEquals(el.getPtIndex(2), 2); for (int i= 0; i < 9; i++) { assertEquals(mail_.isElementTrigoOriente(i), -1); } assertEquals(el.isSegmentInEltOrient(0, 9), 1); assertEquals(el.isSegmentInEltOrient(9, 2), 1); assertEquals(el.isSegmentInEltOrient(2, 10), 1); assertEquals(el.isSegmentInEltOrient(10, 1), 1); assertEquals(el.isSegmentInEltOrient(1, 11), 1); assertEquals(el.isSegmentInEltOrient(11, 0), 1); assertEquals(el.isSegmentInEltOrient(0, 11), -1); assertEquals(el.isSegmentInEltOrient(0, 12), 0); } private void _testMinMaxCommun() { EfNode p= mail_.getMaxPoint(); assertEquals(p.getX(), 10, eps_); assertEquals(p.getY(), 20, eps_); assertEquals(p.getZ(), 30, eps_); p= mail_.getMinPoint(); assertEquals(p.getX(), 0, eps_); assertEquals(p.getY(), -1, eps_); assertEquals(p.getZ(), -15, eps_); } public void testMinMaxCommun() { initMaillage(); _testMinMaxCommun(); } public void testMinMaxCommunT6() { initMaillageT6(); _testMinMaxCommun(); } public void _testBordCommun() { EfFrontier bord= mail_.getFrontiers(); assertEquals(2, bord.getNbFrontier()); int[] eltContains4= mail_.getEltIdxContainsPtIdx(4); Arrays.sort(eltContains4); assertEquals(eltContains4.length, 3); assertTrue(Arrays.binarySearch(eltContains4, 2) >= 0); assertTrue(Arrays.binarySearch(eltContains4, 3) >= 0); assertTrue(Arrays.binarySearch(eltContains4, 5) >= 0); int n= bord.getNbPt(0); assertEquals(n, 6); assertEquals(0, bord.getIdxGlobal(0, 0)); assertEquals(1, bord.getIdxGlobal(0, 1)); assertEquals(6, bord.getIdxGlobal(0, 2)); assertEquals(8, bord.getIdxGlobal(0, 3)); assertEquals(7, bord.getIdxGlobal(0, 4)); assertEquals(4, bord.getIdxGlobal(0, 5)); n= bord.getNbPt(1); assertEquals(n, 3); assertEquals(2, bord.getIdxGlobal(1, 0)); assertEquals(5, bord.getIdxGlobal(1, 1)); assertEquals(3, bord.getIdxGlobal(1, 2)); } public void testBord() { initMaillage(); mail_.computeBord(null); _testBordCommun(); } public void testBordT6() { initMaillageT6(); mail_.computeBord(null); _testBordCommunT6(); } public void _testBordCommunT6() { EfFrontier bord= mail_.getFrontiers(); assertEquals(bord.getNbFrontier(), 2); int[] eltContains4= mail_.getEltIdxContainsPtIdx(4); Arrays.sort(eltContains4); assertEquals(eltContains4.length, 3); assertTrue(Arrays.binarySearch(eltContains4, 2) >= 0); assertTrue(Arrays.binarySearch(eltContains4, 3) >= 0); assertTrue(Arrays.binarySearch(eltContains4, 5) >= 0); int n= bord.getNbPt(0); assertEquals(n, 12); assertEquals(0, bord.getIdxGlobal(0, 0)); assertEquals(11, bord.getIdxGlobal(0, 1)); assertEquals(1, bord.getIdxGlobal(0, 2)); assertEquals(23, bord.getIdxGlobal(0, 3)); assertEquals(6, bord.getIdxGlobal(0, 4)); assertEquals(26, bord.getIdxGlobal(0, 5)); assertEquals(8, bord.getIdxGlobal(0, 6)); assertEquals(24, bord.getIdxGlobal(0, 7)); assertEquals(7, bord.getIdxGlobal(0, 8)); assertEquals(21, bord.getIdxGlobal(0, 9)); assertEquals(4, bord.getIdxGlobal(0, 10)); assertEquals(14, bord.getIdxGlobal(0, 11)); n= bord.getNbPt(1); assertEquals(n, 6); assertEquals(2, bord.getIdxGlobal(1, 0)); assertEquals(17, bord.getIdxGlobal(1, 1)); assertEquals(5, bord.getIdxGlobal(1, 2)); assertEquals(20, bord.getIdxGlobal(1, 3)); assertEquals(3, bord.getIdxGlobal(1, 4)); assertEquals(12, bord.getIdxGlobal(1, 5)); } public void testT3T6() { initMaillage(); TObjectIntHashMap segmentPtIdx= new TObjectIntHashMap(mail_.getEltNb() * 3); EfGrid temp= EfLib.maillageT3enT6(mail_, progress_, segmentPtIdx); assertEquals(temp.getEltNb(), 9); assertEquals(27, temp.getPtsNb()); initMaillageT6(); assertTrue(temp.isEquivalent(mail_, true, eps_)); EfdSegment s= new EfdSegment(0, 1); assertEquals(11, segmentPtIdx.get(s)); s.setPt1Idx(1); s.setPt2Idx(2); assertEquals(10, segmentPtIdx.get(s)); s.setPt1Idx(3); s.setPt2Idx(2); assertEquals(12, segmentPtIdx.get(s)); s.setPt1Idx(1); s.setPt2Idx(3); assertEquals(13, segmentPtIdx.get(s)); s.setPt1Idx(0); s.setPt2Idx(4); assertEquals(14, segmentPtIdx.get(s)); s.setPt1Idx(4); s.setPt2Idx(2); assertEquals(15, segmentPtIdx.get(s)); s.setPt1Idx(4); s.setPt2Idx(5); assertEquals(16, segmentPtIdx.get(s)); s.setPt1Idx(5); s.setPt2Idx(2); assertEquals(17, segmentPtIdx.get(s)); s.setPt1Idx(5); s.setPt2Idx(6); assertEquals(18, segmentPtIdx.get(s)); s.setPt1Idx(3); s.setPt2Idx(6); assertEquals(19, segmentPtIdx.get(s)); s.setPt1Idx(5); s.setPt2Idx(3); assertEquals(20, segmentPtIdx.get(s)); s.setPt1Idx(4); s.setPt2Idx(7); assertEquals(21, segmentPtIdx.get(s)); s.setPt1Idx(7); s.setPt2Idx(5); assertEquals(22, segmentPtIdx.get(s)); s.setPt1Idx(1); s.setPt2Idx(6); assertEquals(23, segmentPtIdx.get(s)); s.setPt1Idx(7); s.setPt2Idx(8); assertEquals(24, segmentPtIdx.get(s)); s.setPt1Idx(8); s.setPt2Idx(5); assertEquals(25, segmentPtIdx.get(s)); s.setPt1Idx(8); s.setPt2Idx(6); assertEquals(26, segmentPtIdx.get(s)); assertTrue(temp.isSameStrict(mail_)); } public void testT61T3() { initMaillageT6(); TIntIntHashMap T6T3Corresp= new TIntIntHashMap(mail_.getPtsNb() / 2); EfGrid temp= EfLib.maillageT6enT3(mail_, progress_, T6T3Corresp); assertNotNull(temp); temp.isSameStrict(mail_); assertEquals(9, T6T3Corresp.size()); for (int i= 0; i < 9; i++) { assertEquals(i, T6T3Corresp.get(i)); } //Autre essai EfNode[] pts= new EfNode[15]; pts[0]= new EfNode(0, 0, 0); pts[1]= new EfNode(1, 1, 0); pts[2]= new EfNode(2, 2, 0); pts[3]= new EfNode(3, 3, 0); pts[4]= new EfNode(4, 4, 0); pts[5]= new EfNode(5, 3, 0); pts[6]= new EfNode(6, 2, 0); pts[7]= new EfNode(7, 1, 0); pts[8]= new EfNode(8, 0, 0); pts[9]= new EfNode(6, 0, 0); pts[10]= new EfNode(4, 0, 0); pts[11]= new EfNode(2, 0, 0); pts[12]= new EfNode(3, 1, 0); pts[13]= new EfNode(4, 2, 0); pts[14]= new EfNode(5, 1, 0); EfElement[] elt= new EfElement[4]; elt[0]= new EfElement(new int[] { 0, 1, 2, 12, 10, 11 }); elt[1]= new EfElement(new int[] { 2, 3, 4, 5, 6, 13 }); elt[2]= new EfElement(new int[] { 6, 7, 8, 9, 10, 14 }); elt[3]= new EfElement(new int[] { 10, 12, 2, 13, 6, 14 }); //Attention a bien initialiser la table de correspondance. T6T3Corresp.clear(); EfGrid t3calc= EfLib.maillageT6enT3(new EfGrid(pts, elt), null, T6T3Corresp); pts= new EfNode[6]; pts[0]= new EfNode(0, 0, 0); pts[1]= new EfNode(2, 2, 0); pts[2]= new EfNode(4, 4, 0); pts[3]= new EfNode(6, 2, 0); pts[4]= new EfNode(8, 0, 0); pts[5]= new EfNode(4, 0, 0); elt= new EfElement[4]; elt[0]= new EfElement(new int[] { 0, 1, 5 }); elt[1]= new EfElement(new int[] { 1, 2, 3 }); elt[2]= new EfElement(new int[] { 3, 4, 5 }); elt[3]= new EfElement(new int[] { 5, 1, 3 }); EfGrid t3final= new EfGrid(pts, elt); assertTrue(t3calc.isSameStrict(t3final)); for (int i= 0; i < pts.length; i++) { assertEquals(i, T6T3Corresp.get(2 * i)); } } public void testT6en4T3() { initMaillageT6(); EfGrid temp= EfLib.maillageT6en4T3(mail_, progress_); assertNotNull(temp); assertEquals(36, temp.getEltNb()); EfElement t= temp.getElement(0); assertEquals(t.getPtIndex(0), 0); assertEquals(t.getPtIndex(1), 9); assertEquals(t.getPtIndex(2), 11); t= temp.getElement(12); assertEquals(t.getPtIndex(0), 4); assertEquals(t.getPtIndex(1), 16); assertEquals(t.getPtIndex(2), 15); t= temp.getElement(13); assertEquals(t.getPtIndex(0), 16); assertEquals(t.getPtIndex(1), 5); assertEquals(t.getPtIndex(2), 17); t= temp.getElement(14); assertEquals(t.getPtIndex(0), 17); assertEquals(t.getPtIndex(1), 2); assertEquals(t.getPtIndex(2), 15); t= temp.getElement(15); assertEquals(t.getPtIndex(0), 16); assertEquals(t.getPtIndex(1), 17); assertEquals(t.getPtIndex(2), 15); t= temp.getElement(35); assertEquals(t.getPtIndex(0), 18); assertEquals(t.getPtIndex(1), 25); assertEquals(t.getPtIndex(2), 26); } public void testIpobo() { initMaillage(); int[] ipobo= new int[] { 0, 1, 6, 8, 7, 4, 2, 5, 3 }; EfGrid.computeBordFast(mail_, ipobo, null); _testBordCommun(); } public void testIterator() { TIntArrayList l= new TIntArrayList(); initMaillage(); mail_.computeBord(null); for (EfFrontier.FrontiereIdxIterator it= mail_.getFrontiers().getFrontierIterator(); it.hasNext(); ) { l.add(it.next()); } assertTrue(mail_.getFrontiers().isSame(l.toNativeArray())); } public void testInterpRef() { initMaillage(); InterpolationNearestNeighborRef ref= mail_; int[] d= new int[4]; assertTrue(ref.getQuadrantIdx(1, -2, d)); assertEquals(-1, d[0]); assertEquals(-1, d[1]); assertEquals(1, d[2]); assertEquals(0, d[3]); assertTrue(ref.getQuadrantIdx(1, 0, d)); assertEquals(0, d[0]); assertEquals(1, d[1]); assertEquals(2, d[2]); assertEquals(0, d[3]); assertTrue(ref.getQuadrantIdx(0.5, 3, d)); assertEquals(4, d[0]); assertEquals(2, d[1]); assertEquals(5, d[2]); assertEquals(7, d[3]); //pour verifier que les -1 sont bien remis assertTrue(ref.getQuadrantIdx(1, -2, d)); assertEquals(-1, d[0]); assertEquals(-1, d[1]); assertEquals(1, d[2]); assertEquals(0, d[3]); } public void testInterpolFromGrid() { initMaillage(); EfGrid target; DodicoAnalyze a; double[] d; target= createMaillage(); a= new DodicoAnalyze(); EfLib.orienteGrid(mail_, null, true, null); d= EfInterpolationGrid.interpolation(mail_, target, a, null); if (!a.isEmpty()) { a.printResume(); } assertTrue(a.isEmpty()); assertEquals(target.getPtsNb(), d.length); for (int i= target.getPtsNb() - 1; i >= 0; i--) { assertEquals(d[i], target.getPt(i).getZ(), eps_); } initMaillageT6(); EfLib.orienteGrid(mail_, null, true, null); target= createMaillageT6(); a= new DodicoAnalyze(); d= EfInterpolationGrid.interpolation(mail_, target, a, null); if (!a.isEmpty()) { a.printResume(); } assertTrue(a.isEmpty()); assertEquals(target.getPtsNb(), d.length); for (int i= target.getPtsNb() - 1; i >= 0; i--) { assertEquals(d[i], target.getPt(i).getZ(), eps_); } } private static double getInterpolValue( double _d1, double _z1, double _d2, double _z2) { return (_z1 / (_d1 * _d1) + _z2 / (_d2 * _d2)) / (1 / (_d1 * _d1) + 1 / (_d2 * _d2)); } private static double getInterpolValue( double _d1, double _z1, double _d2, double _z2, double _d3, double _z3, double _d4, double _z4) { return ( _z1 / (_d1 * _d1) + _z2 / (_d2 * _d2) + _z3 / (_d3 * _d3) + _z4 / (_d4 * _d4)) / (1 / (_d1 * _d1) + 1 / (_d2 * _d2) + 1 / (_d3 * _d3) + 1 / (_d4 * _d4)); } public void testInterpolation() { initMaillage(); EfGrid g2= createMaillage(); //premier test primaire pour verifier l'interpolation InterpolationNearestNeighborRef ref= g2; DodicoAnalyze a= new DodicoAnalyze(); double[] z= Interpolateur.interpol(mail_, ref, 1, a, null); assertTrue(a.isEmpty()); assertEquals(g2.getPtsNb(), z.length); for (int i= z.length - 1; i >= 0; i--) { assertEquals(z[i], mail_.getPt(i).getZ(), eps_); } ArrayList l= new ArrayList(); //le point 0 l.add(new EfNode(-0.5, 0, 3)); // le point 0 l.add(new EfNode(0.5, -0.5, 14)); l.add(new EfNode(0.5, 0.5, 4)); //le point 4 l.add(new EfNode(-0.5, 2, -4)); //le point 4 et 2 l.add(new EfNode(0.5, 2, 14)); //le point 7 l.add(new EfNode(-0.5, 4, 3)); //le point 7 et 5 l.add(new EfNode(0.5, 4, 34)); //le point 5 l.add(new EfNode(1.5, 4, 21354)); //le point 2 et 3 l.add(new EfNode(1.5, 2, 3)); //le point 3 l.add(new EfNode(3.5, 2, 45)); //le point 1 l.add(new EfNode(1.5, -1, 45)); //le point 1 l.add(new EfNode(2.5, -1, 1)); //le point 6 l.add(new EfNode(10, 11.5, 0)); // le point 6 l.add(new EfNode(10, 10.5, 14)); //le point 8 qui ne sera pas pris en compte //car les points ref en dehors de la frontiere et trop loin l.add(new EfNode(-1, 20, 4)); l.add(new EfNode(5, 20, 4)); // les z attendus TDoubleArrayList d= new TDoubleArrayList(); //0 double dist= CtuluGeometrie.getDistance(0, 0, 0.5, 0.5); d.add(getInterpolValue(0.5, 3, 0.5, 3, dist, 14, dist, 4)); //1 d.add(getInterpolValue(0.5, 1, 0.5, 45)); //2 d.add(getInterpolValue(0.5, 3, 0.5, 14)); // 3 d.add(getInterpolValue(1.5, 45, 0.5, 3)); // 4 d.add(getInterpolValue(0.5, 14, 0.5, -4)); // 5 d.add(getInterpolValue(0.5, 34, 0.5, 21354)); //6 double d6= getInterpolValue(0.5, 0, 0.5, 14); d.add(d6); //7 d.add(getInterpolValue(0.5, 3, 0.5, 34)); //8 idem que 6 d.add(d6); EfNode[] list= new EfNode[l.size()]; l.toArray(list); ref= new InterpolationNearestNeighborRef.ListOnZ(list); z= Interpolateur.interpol(mail_, ref, 1, a, null); assertFalse(a.isEmpty()); assertEquals(z.length, d.size()); for (int i= z.length - 1; i >= 0; i--) { assertEquals(d.getQuick(i), z[i], eps_); } } public void TestShiftElement() { EfElement el= new EfElement(new int[] { 1, 2, 3, 4, 5 }); EfElement n= EfElement.ShiftLeftElementIndex(el); assertEquals(n.getPtNb(), 5); assertEquals(n.getPtIndex(0), 2); assertEquals(n.getPtIndex(1), 3); assertEquals(n.getPtIndex(2), 4); assertEquals(n.getPtIndex(3), 5); assertEquals(n.getPtIndex(4), 1); } } Index: TestTransformationCorEleBthSerafin.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/h2d/TestTransformationCorEleBthSerafin.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** TestTransformationCorEleBthSerafin.java 12 Feb 2004 15:32:50 -0000 1.5 --- TestTransformationCorEleBthSerafin.java 5 Mar 2004 15:18:25 -0000 1.6 *************** *** 10,25 **** import java.io.File; import java.util.HashMap; import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.ProgressionTestAdapter; import org.fudaa.dodico.ef.EfGrid; import org.fudaa.dodico.ef.EfLib; - import org.fudaa.dodico.fichiers.FileFormat; - import org.fudaa.dodico.fichiers.FileFormatVersion; import org.fudaa.dodico.fichiers.FileOperationSynthese; - import org.fudaa.dodico.fortran.NativeBinaryInputStream; import org.fudaa.dodico.reflux.io.CorEleBthFileFormat; import org.fudaa.dodico.reflux.io.CorEleBthInterface; import org.fudaa.dodico.telemac.io.SerafinFileFormat; - import org.fudaa.dodico.telemac.io.SerafinInterface; import org.fudaa.dodico.telemac.io.SerafinMaillageAdapter; import org.fudaa.dodico.telemac.io.SerafinWriter; --- 10,22 ---- import java.io.File; import java.util.HashMap; + import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.ProgressionTestAdapter; import org.fudaa.dodico.ef.EfGrid; import org.fudaa.dodico.ef.EfLib; import org.fudaa.dodico.fichiers.FileOperationSynthese; import org.fudaa.dodico.reflux.io.CorEleBthFileFormat; import org.fudaa.dodico.reflux.io.CorEleBthInterface; import org.fudaa.dodico.telemac.io.SerafinFileFormat; import org.fudaa.dodico.telemac.io.SerafinMaillageAdapter; import org.fudaa.dodico.telemac.io.SerafinWriter; --- TestBord.java DELETED --- --- TestMaillage.java DELETED --- |
|
From: <de...@us...> - 2004-03-05 15:32:54
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19764/src/org/fudaa/dodico/test Added Files: TestJCommun.java TestJFortranBinary.java TestJEvolution.java TestJCommandManager.java Removed Files: TestFortranBinary.java TestCommun.java TestCommandManager.java TestEvolution.java Log Message: Renommer les fichiers Test en TestJ --- NEW FILE: TestJCommun.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: TestJFortranBinary.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: TestJEvolution.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: TestJCommandManager.java --- /* * @file TestCommandManager.java * @creation 21 oct. 2003 * @modification $Date: 2004/03/05 15:18:39 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail de...@fu... */ package org.fudaa.dodico.test; import org.fudaa.dodico.commun.DodicoCommand; import org.fudaa.dodico.commun.DodicoCommandManager; import junit.framework.TestCase; /** * @author deniger * @version $Id: TestJCommandManager.java,v 1.1 2004/03/05 15:18:39 deniger Exp $ */ public class TestJCommandManager extends TestCase { /** * Constructeur par defaut */ public TestJCommandManager() {} /** * test DodicoCommandManager */ public void testCmdManager() { int max= 6; DodicoCommandManager mng= new DodicoCommandManager(max); assertEquals(max, mng.getNbMaxCmd()); assertFalse(mng.canRedo()); assertFalse(mng.canUndo()); testCommand[] cmds= new testCommand[5]; cmds[0]= createDodicoCommand(); mng.addCmd(cmds[0]); assertFalse(mng.canRedo()); assertTrue(mng.canUndo()); assertFalse(mng.isACommandUndo()); mng.undo(); assertTrue(mng.canRedo()); assertFalse(mng.canUndo()); assertTrue(mng.isACommandUndo()); mng.redo(); assertFalse(mng.canRedo()); assertTrue(mng.canUndo()); assertFalse(mng.isACommandUndo()); for (int i= 1; i < cmds.length; i++) { cmds[i]= createDodicoCommand(); mng.addCmd(cmds[i]); } assertEquals(cmds.length, mng.getNbCmd()); mng.undo(); assertTrue(cmds[cmds.length - 1].undo_); mng.redo(); assertFalse(cmds[cmds.length - 1].undo_); mng.undo(); assertTrue(cmds[cmds.length - 1].undo_); mng.undo(); assertTrue(mng.isUndo(cmds.length - 2)); assertTrue(mng.isUndo(cmds[cmds.length - 2])); assertTrue(cmds[cmds.length - 2].undo_); mng.redo(); assertFalse(cmds[cmds.length - 2].undo_); assertTrue(cmds[cmds.length - 1].undo_); assertTrue(mng.isUndo(cmds.length - 1)); assertTrue(mng.isUndo(cmds[cmds.length - 1])); mng.undo(); mng.addCmd(createDodicoCommand()); assertEquals(cmds.length - 1, mng.getNbCmd()); mng.addCmd(createDodicoCommand()); mng.addCmd(createDodicoCommand()); assertEquals(max, mng.getNbCmd()); mng.addCmd(createDodicoCommand()); assertEquals(max, mng.getNbCmd()); assertFalse(mng.containsCmd(cmds[0])); assertTrue(mng.containsCmd(cmds[1])); mng.addCmd(createDodicoCommand()); assertFalse(mng.containsCmd(cmds[1])); } /** * @return testCommand */ public testCommand createDodicoCommand() { return new testCommand(); } private class testCommand implements DodicoCommand { boolean undo_; /** * Met undo a true * @see org.fudaa.dodico.commun.DodicoCommand#undo() */ public void undo() { undo_= true; } /** * Met undo a false * @see org.fudaa.dodico.commun.DodicoCommand#undo() */ public void redo() { undo_= false; } } } --- TestFortranBinary.java DELETED --- --- TestCommun.java DELETED --- --- TestCommandManager.java DELETED --- --- TestEvolution.java DELETED --- |
|
From: <de...@us...> - 2004-03-05 15:32:54
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19764/src/org/fudaa/dodico/reflux/io Modified Files: CrbFileFormat.java Log Message: Renommer les fichiers Test en TestJ Index: CrbFileFormat.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io/CrbFileFormat.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CrbFileFormat.java 21 Jan 2004 10:59:10 -0000 1.2 --- CrbFileFormat.java 5 Mar 2004 15:18:39 -0000 1.3 *************** *** 26,30 **** * @author deniger * @version $Id$ ! * @see org.fudaa.dodico.test.reflux.TestCrb */ public class CrbFileFormat extends FileFormat { --- 26,30 ---- * @author deniger * @version $Id$ ! * @see org.fudaa.dodico.test.reflux.TestJCrb */ public class CrbFileFormat extends FileFormat { |
|
From: <de...@us...> - 2004-03-05 15:32:54
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mesure In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19764/src/org/fudaa/dodico/mesure Modified Files: EvolutionReguliere.java Log Message: Renommer les fichiers Test en TestJ Index: EvolutionReguliere.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mesure/EvolutionReguliere.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EvolutionReguliere.java 19 Dec 2003 12:10:37 -0000 1.1 --- EvolutionReguliere.java 5 Mar 2004 15:18:39 -0000 1.2 *************** *** 14,18 **** /** * Une evolution reguliere qui n'utilise pas les objets corba. ! * @see org.fudaa.dodico.test.TestEvolution * @author deniger * @version $Id$ --- 14,18 ---- /** * Une evolution reguliere qui n'utilise pas les objets corba. ! * @see org.fudaa.dodico.test.TestJEvolution * @author deniger * @version $Id$ |
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/geodesie In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19764/src/org/fudaa/dodico/test/geodesie Added Files: TestJEllipsoide.java TestJLambert.java Removed Files: TestLambert.java TestEllipsoide.java Log Message: Renommer les fichiers Test en TestJ --- NEW FILE: TestJEllipsoide.java --- /* * @file TestEllipsoide.java * @creation 2002-09-12 * @modification $Date: 2004/03/05 15:18:39 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail de...@fu... */ package org.fudaa.dodico.test.geodesie; import junit.framework.TestCase; import org.fudaa.dodico.geodesie.Ellipsoide; import org.fudaa.dodico.geodesie.SysGeodesiqueLambert; /** * Test * * @version $Id: TestJEllipsoide.java,v 1.1 2004/03/05 15:18:39 deniger Exp $ * @author Fred Deniger */ public class TestJEllipsoide extends TestCase { double delta_; Ellipsoide test_; public TestJEllipsoide() { delta_= 1E-4; test_= Ellipsoide.getEllipsoideHAYFORD1909(); } /** * Calcul de la hateur normale. */ public void testHauteurNormale() { System.out.println("testHauteurNormaleRadian"); double latRad= 0.977384381; double latDeg= latRad * 180 / Math.PI; double sortie= 6393174.9755; double r= test_._hauteurNormaleRadian(latRad); assertEquals(r, sortie, delta_); r= test_.hauteurNormale(latDeg); assertEquals(r, sortie, delta_); } /** * Calcul de la latitude a partir de la latitude isometrique. */ public void testLatitude() { System.out.println("testLatitude"); double latIso= 1.00552653648d; double latRad= 0.872664626; double latDeg= latRad * 180 / Math.PI; double r= test_._latitudeRadian(latIso, 1E-11); assertEquals(r, latRad, delta_); r= test_.latitude(latIso, 1E-11); assertEquals(r, latDeg, delta_); } /** * Calcul de la latitude isometrique a partir de la latitude. */ public void testLatitudeIso() { System.out.println("testLatitudeIso()"); double latRad= 0.872664626; double latDeg= latRad * 180 / Math.PI; double sortie= 1.00552653649d; double r= test_._latitudeIsometriqueRadian(latRad); assertEquals(r, sortie, delta_); r= test_.latitudeIsometrique(latDeg); assertEquals(r, sortie, delta_); } /** * Coordonnees cartesiennes en coordonnees geographiques. */ public void testCartesienEnGeo() { SysGeodesiqueLambert test= new SysGeodesiqueLambert( "essai", Ellipsoide.getEllipsoideClarke(), 0d, 0d, -0.575958653 * 180 / Math.PI, -0.785398163 * 180 / Math.PI, 0d, 0d); double[] entree= new double[] { 6376064.695, 111294.623, 128984.725 }; double[] sortie= new double[] { 0.01745329248 * 180 / Math.PI, 0.02036217457 * 180 / Math.PI, 99.9995 }; double[] r= test.coordCartesiennesToCoordGeo(entree); assertEquals(sortie[0], r[0], delta_); assertEquals(sortie[1], r[1], delta_); assertEquals(sortie[2], r[2], delta_); entree= new double[] { 6378232.215, 18553.578, 0 }; sortie= new double[] { 0.00290888212 * 180 / Math.PI, 0, 10.0001 }; r= test.coordCartesiennesToCoordGeo(entree); assertEquals(sortie[0], r[0], delta_); assertEquals(sortie[1], r[1], delta_); assertEquals(sortie[2], r[2], delta_); } /** * Coordonnees geographiques en coordonnees cartesiennes. */ public void testGeoEnCartesien() { SysGeodesiqueLambert test= new SysGeodesiqueLambert( "essai", Ellipsoide.getEllipsoideClarke(), 0d, 0d, -0.575958653 * 180 / Math.PI, -0.785398163 * 180 / Math.PI, 0d, 0d); double[] entree= new double[] { 0.01745329248 * 180D / Math.PI, 0.02036217457 * 180D / Math.PI, 100d }; double[] sortie= new double[] { 6376064.6955, 111294.623, 128984.725 }; double[] r= test.coordGeoToCoordCartesiennes(entree); assertEquals(sortie[0], r[0], delta_); assertEquals(sortie[1], r[1], delta_); assertEquals(sortie[2], r[2], delta_); entree= new double[] { 0.00290888212 * 180 / Math.PI, 0d, 10d }; sortie= new double[] { 6378232.2149, 18553.578, 0 }; r= test.coordGeoToCoordCartesiennes(entree); assertEquals(sortie[0], r[0], delta_); assertEquals(sortie[1], r[1], delta_); assertEquals(sortie[2], r[2], delta_); } } --- NEW FILE: TestJLambert.java --- /* * @file TestLambert.java * @creation 2002-09-12 * @modification $Date: 2004/03/05 15:18:39 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail de...@fu... */ package org.fudaa.dodico.test.geodesie; import org.fudaa.dodico.geodesie.*; import junit.framework.*; /** * Test les fonctions de conversion du systeme geodesique Lambert. * * @version $Id: TestJLambert.java,v 1.1 2004/03/05 15:18:39 deniger Exp $ * @author Fred Deniger */ public class TestJLambert extends TestCase { double delta_; public TestJLambert() { delta_= 1E-2; System.out.println("precision 1E-2"); } /** * Test le calcul des parametres de projections. */ public void testParametresProjection() { System.out.println("Calcul des parametres de projection"); SysGeodesiqueLambert test= new SysGeodesiqueLambert( "essai", Ellipsoide.getEllipsoideHAYFORD1909(), 0d, 0d, -0.575958653 * 180 / Math.PI, -0.785398163 * 180 / Math.PI, 0d, 0d); double sortie= -12453174.1795; assertEquals(sortie, test.c(), delta_); sortie= 0; assertEquals(sortie, test.long0(), delta_); sortie= -0.63059633; assertEquals(sortie, test.n(), delta_); sortie= 0; assertEquals(sortie, test.Xs(), delta_); sortie= -12453174.1795; assertEquals(sortie, test.Ys(), delta_); } /** * Coordonnees geographiques en coordonnees planes dans le systeme Lambert I. */ public void testGeoEnLambertI() { double[] r; double[] sortie; System.out.println("Changement de projection I"); double lonParis= SysGeodesique.enDegre(2, 20, 14.025); SysGeodesiqueLambert testLambert= new SysGeodesiqueLambert( "I", Ellipsoide.getEllipsoideClarke(), lonParis, 55d * 0.9, SysGeodesique.enDegre(48, 35, 54.682), SysGeodesique.enDegre(50, 23, 45.282), 600000, 200000); sortie= new double[] { 1029705.0818, 272723.851 }; r= testLambert.coordGeoToCoordPlanes( 0.145512099 * 180d / Math.PI, 0.872664626 * 180d / Math.PI, 0); assertEquals(sortie[0], r[0], delta_); assertEquals(sortie[1], r[1], delta_); sortie= new double[] { 0.145512099 * 180 / Math.PI, 0.872664626 * 180 / Math.PI }; r= testLambert.coordPlanesToCoordGeo(1029705.083, 272723.849, 0); assertEquals(sortie[0], r[0], delta_); assertEquals(sortie[1], r[1], delta_); } /** * Coordonnees geographiques en coordonnees planes dans le systeme Lambert II. */ public void testGeoEnLambertII() { System.out.println("Changement de projection II"); double lonParis= SysGeodesique.enDegre(2, 20, 14.025); SysGeodesiqueLambert testLambertII= new SysGeodesiqueLambert( "II", Ellipsoide.getEllipsoideClarke(), lonParis, 52d * 0.9, SysGeodesique.enDegre(45, 53, 56.108), SysGeodesique.enDegre(47, 41, 45.652), 600000, 200000); double[] sortie= new double[] { 632542.058, 180804.145 }; double[] r= testLambertII.coordGeoToCoordPlanes( 0.4721669 * 0.9 + lonParis, 51.8072313 * 0.9, 0); assertEquals(sortie[0], r[0], delta_); assertEquals(sortie[1], r[1], delta_); } /** * Changement de systeme Lambert I en LambertII etendu. */ public void testLambertIEnLambertIIEtendu() { System.out.println("Changement de projection II etendu"); double lonParis= SysGeodesique.enDegre(2, 20, 14.025); SysGeodesiqueLambert testLambertIIEtendu= new SysGeodesiqueLambert( "IIetendu", Ellipsoide.getEllipsoideClarke(), lonParis, 52d * 0.9, SysGeodesique.enDegre(45, 53, 56.108), SysGeodesique.enDegre(47, 41, 45.652), 600000, 2200000); SysGeodesiqueLambert testLambert= new SysGeodesiqueLambert( "I", Ellipsoide.getEllipsoideClarke(), lonParis, 55d * 0.9, SysGeodesique.enDegre(48, 35, 54.682), SysGeodesique.enDegre(50, 23, 45.282), 600000, 200000); double[] sortie= new double[] { 750283.12d, 2600360.77d }; double[] r= testLambert.toSysteme( testLambert.COORD_PLANES, testLambertIIEtendu, new double[] { 750000d, 300000d, 0 }); assertEquals(sortie[0], r[0], delta_); assertEquals(sortie[1], r[1], delta_); } } --- TestLambert.java DELETED --- --- TestEllipsoide.java DELETED --- |
|
From: <de...@us...> - 2004-03-05 15:32:53
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/ef In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19764/src/org/fudaa/dodico/ef Modified Files: EfGrid.java Log Message: Renommer les fichiers Test en TestJ Index: EfGrid.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/ef/EfGrid.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EfGrid.java 12 Feb 2004 15:32:44 -0000 1.1 --- EfGrid.java 5 Mar 2004 15:18:39 -0000 1.2 *************** *** 34,39 **** * @author deniger * @version $Id$ ! * @see org.fudaa.dodico.test.h2d.TestMaillage ! * @see org.fudaa.dodico.test.telemac.TestSerafin */ public class EfGrid --- 34,39 ---- * @author deniger * @version $Id$ ! * @see org.fudaa.dodico.test.h2d.TestJMaillage ! * @see org.fudaa.dodico.test.telemac.TestJSerafin */ public class EfGrid |
|
From: <de...@us...> - 2004-03-05 15:32:49
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/reflux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19764/src/org/fudaa/dodico/test/reflux Modified Files: TestRefluxParametres.java Added Files: TestJCLTransitoire.java TestJDunes.java TestJINP.java TestJCorEleBth.java TestJCrb.java Removed Files: TestCLTransitoire.java TestCrb.java TestINP.java TestDunes.java TestCorEleBth.java Log Message: Renommer les fichiers Test en TestJ --- NEW FILE: TestJCLTransitoire.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: TestJDunes.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: TestJINP.java --- /* * @file TestINP.java * @creation 25 mars 2003 * @modification $Date: 2004/03/05 15:18:39 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail de...@fu... */ package org.fudaa.dodico.test.reflux; import java.io.File; import java.util.HashMap; import java.util.Map; import org.fudaa.dodico.commun.DodicoAnalyze; import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.ProgressionTestAdapter; import org.fudaa.dodico.dico.DicoEntite; import org.fudaa.dodico.ef.EfElement; import org.fudaa.dodico.ef.EfFrontier; import org.fudaa.dodico.ef.EfGrid; import org.fudaa.dodico.ef.EfNode; import org.fudaa.dodico.fichiers.FileOperationSynthese; import org.fudaa.dodico.h2d.H2dNodalPropertyMixte; import org.fudaa.dodico.h2d.H2dTimeStepGroup; import org.fudaa.dodico.h2d.reflux.H2dRefluxBcManager; import org.fudaa.dodico.h2d.reflux.H2dRefluxBordIndexGeneral; import org.fudaa.dodico.h2d.reflux.H2dRefluxBoundaryCondition; import org.fudaa.dodico.h2d.reflux.H2dRefluxBoundaryConditionMiddleFriction; import org.fudaa.dodico.h2d.reflux.H2dRefluxParameters; import org.fudaa.dodico.h2d.type.H2dBcType; import org.fudaa.dodico.h2d.type.H2dBoundaryType; import org.fudaa.dodico.h2d.type.H2dProjetType; import org.fudaa.dodico.h2d.type.H2dResolutionMethodType; import org.fudaa.dodico.h2d.type.H2dResolutionSchemaType; import org.fudaa.dodico.reflux.io.INPFileFormat; import org.fudaa.dodico.reflux.io.INPInterface; import org.fudaa.dodico.test.TestIO; /** * @author deniger * @version $Id: TestJINP.java,v 1.1 2004/03/05 15:18:39 deniger Exp $ */ public class TestJINP extends TestIO { /** * test avec "canal_s.inp" */ public TestJINP() { super("canal_s.inp"); } protected void _interfaceTest(INPInterface _t) { INPFileFormat.INPVersion version = INPFileFormat.getInstance().getLastINPVersionImpl(); INPInterface t = _t; assertTrue("5.0".equals(t.getVersion())); assertEquals(t.getTypeProjet(), H2dProjetType.COURANTOLOGIE_2D); assertNotNull(t.getEntiteValue()); assertTrue( t.getEntiteValue().containsKey(version.getDico().getEntite("ITERATION"))); EfGrid m = t.getGrid(); assertEquals(m.getPtsNb(), 1791); EfNode pt = m.getPt(1790); assertEquals(pt.getX(), 1000, eps_); assertEquals(pt.getY(), 10, eps_); assertEquals(pt.getZ(), 12, eps_); pt = m.getPt(1770); assertEquals(pt.getX(), 989.898987, eps_); assertEquals(pt.getY(), 7.5, eps_); assertEquals(pt.getZ(), 12.030303, eps_); //int[] itemp; // int[] itemp=t.getPtsExtremitesElement(); // assertNotNull("Les points frontiere ne sont pas nuls",itemp); // assertEquals(itemp[5], 18); // assertEquals(itemp[499],1790); //H2dRefluxConditionLimite[] tabCl= t.getConditionLimite(); H2dRefluxBoundaryCondition cl = t.getConditionLimite(818); assertEquals(cl.getUType(), H2dBcType.PERMANENT); assertEquals(cl.getU(), 0, eps_); cl = t.getConditionLimite(1790); assertEquals(cl.getVType(), H2dBcType.PERMANENT); assertEquals(cl.getV(), 0, eps_); assertEquals(cl.getNormale(), 0, eps_); assertEquals(cl.getHType(), H2dBcType.PERMANENT); assertEquals(cl.getH(), 13.3, eps_); cl = t.getConditionLimite(1781); assertEquals(cl.getNormale(), 90.0000041, eps_); cl = t.getConditionLimite(0); assertEquals(cl.getHType(), H2dBcType.PERMANENT); assertEquals(cl.getH(), 16.325, eps_); H2dRefluxBordIndexGeneral bord = H2dRefluxBordIndexGeneral.findBordWithIndex(1430, 1421, _t.getBords()); assertEquals(H2dBoundaryType.SOLIDE_FROTTEMENT, bord.getBord()); assertEquals(H2dBcType.PERMANENT, bord.getRugositeType()); assertEquals(3d, bord.getRugosite(), eps_); bord = H2dRefluxBordIndexGeneral.findBordWithIndex(1412, 1403, _t.getBords()); assertEquals(H2dBoundaryType.SOLIDE_FROTTEMENT, bord.getBord()); assertEquals(H2dBcType.PERMANENT, bord.getRugositeType()); assertEquals(3d, bord.getRugosite(), eps_); assertEquals(t.getGrid().getEltNb(), 792); EfElement el = t.getGrid().getElement(791); assertEquals(el.getPtIndex(0), 1788); assertEquals(el.getPtIndex(1), 1789); assertEquals(el.getPtIndex(2), 1790); assertEquals(el.getPtIndex(3), 1780); assertEquals(el.getPtIndex(4), 1770); assertEquals(el.getPtIndex(5), 1779); H2dNodalPropertyMixte[] propelem = t.getPropElementaires(); H2dNodalPropertyMixte prTemp = propelem[0]; assertEquals(prTemp.getValeurTransitoireNb(), 0); assertEquals(792, prTemp.getNbPermanentPt()); prTemp = propelem[1]; assertEquals(0, prTemp.getValeurTransitoireNb()); assertEquals(792, prTemp.getNbPermanentPt()); assertEquals(prTemp.getPermanentValueFor(1), 0.025, eps_); prTemp = propelem[2]; assertEquals(0, prTemp.getValeurTransitoireNb()); assertEquals(792, prTemp.getNbPermanentPt()); prTemp = propelem[3]; assertEquals(0, prTemp.getValeurTransitoireNb()); assertEquals(792, prTemp.getNbPermanentPt()); assertEquals(0.0, prTemp.getPermanentValueFor(0), eps_); for (int i = 790; i >= 0; i--) { if (i != 758) assertEquals(prTemp.getPermanentValueFor(i), 0.0, eps_); else assertEquals(prTemp.getPermanentValueFor(i), 0.01, eps_); } String[] fics = t.getFichiers(); assertEquals(fics.length, 3); assertEquals(fics[0], "canal_s.siv"); assertEquals(fics[1], "canal_s.sov"); assertEquals(fics[2], "canal_s.sfv"); assertFalse(t.contientRadiations()); assertFalse(t.contientSollicitationsReparties()); assertFalse(t.contientVent()); H2dTimeStepGroup[] gts = t.getGroupePasTemps(); assertNotNull(gts); assertEquals(gts.length, 1); H2dTimeStepGroup gt = gts[0]; assertNotNull(gt); assertEquals(gt.getNbPasTemps(), 1); assertEquals(gt.getSchema(), H2dResolutionSchemaType.STATIONNAIRE); assertEquals(gt.getMethode(), H2dResolutionMethodType.SELECT_LUMPING_BCD); assertEquals(gt.getRelaxation(), 1, eps_); assertEquals(gt.getPrecision(), 0.001, eps_); assertEquals(gt.getPrecisionBancCouvrantDecouvrant(), 0.05, eps_); assertEquals(gt.getNombreIterationMax(), 2); Map dtemp = t.getEntiteValue(); assertNotNull(dtemp); for (int i = 8; i >= 0; i--) { DicoEntite ent = version.getCoefContribution(i); assertNotNull(ent); assertEquals(Double.parseDouble((String) dtemp.get(ent)), i, eps_); } } /** * */ public void testEcriture() { // CorEleBthInterface inter=getInter(fic_); // File tmpFile=createTempFile(); // FileOperationSynthese syntheseR=CorEleBthFileFormat.getInstance().write(tmpFile, inter, null); // assertNull(syntheseR.getAnalyze()); // _interfaceTest(getInter(tmpFile)); } protected INPInterface getInter(File _f) { FileOperationSynthese syntheseR = INPFileFormat.getInstance().getLastINPVersionImpl().read(_f, null); INPInterface r = (INPInterface) syntheseR.getSource(); if (syntheseR.containsMessages()) syntheseR.getAnalyze().printResume(); assertTrue(syntheseR.getAnalyze().isEmpty()); return r; } /** * */ public void testLecture() { _interfaceTest(getInter(fic_)); } /** * Test effectue apres l'analyze du fichier inp */ public void testAnalyze() { INPInterface inter = getInter(fic_); DodicoAnalyze anal = new DodicoAnalyze(); H2dRefluxParameters param = H2dRefluxParameters.init( inter, new ProgressionTestAdapter(), INPFileFormat.getInstance().getLastINPVersionImpl(), anal); assertTrue(anal.isEmpty()); EfFrontier maillageBord = param.getMaillage().getFrontiers(); int[] pointsFr = maillageBord.getArray(); int n = pointsFr.length - 1; for (int i = n; i >= 0; i--) { assertEquals(pointsFr[i], param.getRefluxCL(pointsFr[i]).getIndexPt()); } assertEquals(1, maillageBord.getNbFrontier()); H2dRefluxBcManager mng = param.getRefluxClManager(); assertEquals(mng.getGrid().getFrontiers().getNbFrontier(), 1); H2dRefluxBcManager.RefluxMiddleFrontier frontiere0 = mng.getRefluxMiddleFrontier(0); H2dRefluxBoundaryCondition cl; for (int i = 0; i < n; i += 2) { cl = (H2dRefluxBoundaryCondition) frontiere0.getCl(i); assertFalse(cl.isMiddle()); assertFalse(cl.isMiddleWithFriction()); } for (int i = 1; i < n; i += 2) { cl = (H2dRefluxBoundaryCondition) frontiere0.getCl(i); assertTrue(cl.isMiddle()); if ((cl.getIndexPt() == 1421) || (cl.getIndexPt() == 1403)) { assertTrue(cl.isMiddleWithFriction()); H2dRefluxBoundaryConditionMiddleFriction clFr = cl.getMiddleFriction(); assertNotNull(clFr); assertEquals(3, clFr.getFriction(), eps_); assertEquals(H2dBcType.PERMANENT, clFr.getFrictionType()); } else { assertFalse(cl.isMiddleWithFriction()); } } } /** * @param args * Usage: -file=monFichier.mail -out=monFichierReecrit */ public static void main(String[] args) { HashMap arg = DodicoLib.parseArgs(args); String fileName = (String) arg.get("-f"); if (fileName == null) fileName = (String) arg.get("-file"); if (fileName == null) { System.err.println("Usage: -file=monFichier.mail -out=monFichierReecrit"); return; } File f = new File(fileName); if (!f.exists()) { System.err.println("Fichier inexistant " + f.getAbsolutePath()); return; } INPFileFormat.INPVersion version = INPFileFormat.getInstance().getLastINPVersionImpl(); FileOperationSynthese syntheseR = version.read(f, new ProgressionTestAdapter()); INPInterface inpInter = (INPInterface) syntheseR.getSource(); DodicoAnalyze infos = syntheseR.getAnalyze(); if (infos != null) infos.printResume(); if ((infos != null) && (infos.containsFatalError())) return; fileName = (String) arg.get("-o"); if (fileName == null) fileName = (String) arg.get("-out"); if (fileName == null) return; f = new File(fileName); long t1 = System.currentTimeMillis(); version.write(f, inpInter, new ProgressionTestAdapter()); long t2 = System.currentTimeMillis(); System.out.println("temps ecriture " + (t2 - t1)); } } --- NEW FILE: TestJCorEleBth.java --- /* * @file TestCorEleBth.java * @creation 11 mars 2003 * @modification $Date: 2004/03/05 15:18:39 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail de...@fu... */ package org.fudaa.dodico.test.reflux; import java.io.File; import java.util.HashMap; import org.fudaa.dodico.commun.DodicoAnalyze; import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.ProgressionBuAdapter; import org.fudaa.dodico.ef.EfElement; import org.fudaa.dodico.ef.EfElementType; import org.fudaa.dodico.ef.EfGrid; import org.fudaa.dodico.fichiers.FileOperationSynthese; import org.fudaa.dodico.reflux.io.CorEleBthFileFormat; import org.fudaa.dodico.reflux.io.CorEleBthInterface; import org.fudaa.dodico.reflux.io.CorEleBthReader; import org.fudaa.dodico.reflux.io.CorEleBthWriter; import org.fudaa.dodico.test.TestIO; /** * * @author deniger * @version $Id: TestJCorEleBth.java,v 1.1 2004/03/05 15:18:39 deniger Exp $ */ public class TestJCorEleBth extends TestIO { /** * Test de corelebth.cor */ public TestJCorEleBth() { super("corelebth.cor"); } protected void _interfaceTest(CorEleBthInterface _inter) { assertNotNull(_inter); CorEleBthInterface t= _inter; EfGrid maill= t.getGrid(); assertNotNull(maill); assertEquals(maill.getEltType(), EfElementType.T6); //H2dPoint[] pts= maill.getPts(); assertEquals(maill.getPtsNb(), 1791); //test sur le point 34 double d= 15.1515007; double dLu= maill.getPt(33).getX(); assertEquals(d, dLu, eps_); d= 7.5; dLu= maill.getPt(33).getY(); assertEquals(d, dLu, eps_); d= 14.954545975; dLu= maill.getPt(33).getZ(); assertEquals(d, dLu, eps_); //test sur le point 1791 d= 1000; dLu= maill.getPt(1790).getX(); assertEquals(d, dLu, eps_); d= 10; dLu= maill.getPt(1790).getY(); assertEquals(d, dLu, eps_); d= 12; dLu= maill.getPt(1790).getZ(); assertEquals(d, dLu, eps_); //test sur l'element 33 EfElement ele=maill.getElement(33); assertEquals(maill.getEltNb(), 792); assertEquals(maill.getElement(33).getPtNb(), 6); int i= 306; int iLu= ele.getPtIndex(0); assertEquals(i, iLu); i= 307; iLu= ele.getPtIndex(1); assertEquals(i, iLu); i= 308; iLu= ele.getPtIndex(2); assertEquals(i, iLu); i= 298; iLu= ele.getPtIndex(3); assertEquals(i, iLu); i= 288; iLu= ele.getPtIndex(4); assertEquals(i, iLu); i= 297; iLu= ele.getPtIndex(5); assertEquals(i, iLu); } protected static void printAnalyze(String _titre, DodicoAnalyze _analyze) { if (!_analyze.isEmpty()) { System.out.println(_titre); _analyze.printResume(); } } /** * @param args -file=monfic.mail -out=monNouvFic */ public static void main(String[] args) { HashMap arg= DodicoLib.parseArgs(args); String fileName= (String)arg.get("-f"); if (fileName == null) fileName= (String)arg.get("-file"); if (fileName == null) { System.err.println("Usage: -file=monFichier.mail -out=monFichierReecrit"); return; } File f= new File(fileName); if (!f.exists()) { System.err.println("Fichier inexistant " + f.getAbsolutePath()); return; } String base= f.getAbsolutePath(); int temp= base.lastIndexOf('.'); if (temp < 0) { System.err.println("Erreur.Le fichier ne possede pas d'extension"); return; } base= base.substring(0, temp); File cor= new File(base + ".cor"); if (!cor.exists()) { System.err.println( "Le fichier " + cor.getAbsolutePath() + " n'existe pas"); return; } File ele= new File(base + ".ele"); if (!cor.exists()) { System.err.println( "Le fichier " + ele.getAbsolutePath() + " n'existe pas"); return; } File bth= new File(base + ".bth"); if (!cor.exists()) { System.err.println( "Le fichier " + bth.getAbsolutePath() + " n'existe pas"); return; } CorEleBthReader reader= null; CorEleBthInterface t= null; reader= CorEleBthFileFormat .getInstance() .getLastVersionImpl() .createCorEleBthReader(); reader.setIn(cor, ele, bth); reader.setProgressReceiver(new ProgressionBuAdapter(null)); FileOperationSynthese op= reader.read(); t= (CorEleBthInterface)op.getSource(); DodicoAnalyze analyse= op.getAnalyze(); printAnalyze("FICHIERS cor,ele,bth", analyse); EfGrid mail= t.getGrid(); if (mail != null) { DodicoLib.printFields(mail, false); } if (t == null) { System.out.println("probl de lecture"); } String out= (String)arg.get("-out"); if (out == null) return; File corOut= new File(out + ".cor"); if (corOut.exists()) { System.out.println("Le fichier existe deja " + corOut.getAbsolutePath()); return; } File eleOut= new File(out + ".ele"); if (eleOut.exists()) { System.out.println("Le fichier existe deja " + eleOut.getAbsolutePath()); return; } File bthOut= new File(out + ".bth"); if (bthOut.exists()) { System.out.println("Le fichier existe deja " + bthOut.getAbsolutePath()); return; } CorEleBthWriter w= null; w= CorEleBthFileFormat .getInstance() .getLastVersionImpl() .createCorEleBthWriter(); w.setFile(corOut, eleOut, bthOut); w.setProgressReceiver(new ProgressionBuAdapter(null)); System.out.println("Ecriture"); printAnalyze("FICHIER", w.write(t).getAnalyze()); } /** * */ public void testEcriture() { assertTrue(fic_.exists()); CorEleBthInterface inter= getInter(fic_); File tmpFile= createTempFile(); assertNotNull(tmpFile); assertTrue(tmpFile.exists()); File tmpFileEle= createTempFile(); assertNotNull(tmpFileEle); File tmpFileBth= createTempFile(); assertNotNull(tmpFileBth); FileOperationSynthese syntheseR= CorEleBthFileFormat.getInstance().getLastVersionImpl().write( tmpFile,tmpFileEle,tmpFileBth, inter, null); assertTrue(syntheseR.getAnalyze().isEmpty()); assertTrue(tmpFile.exists()); CorEleBthReader r=new CorEleBthReader(CorEleBthFileFormat.getInstance().getLastVersionImpl()); r.setIn(tmpFile, tmpFileEle, tmpFileBth); syntheseR=r.read(); _interfaceTest((CorEleBthInterface)syntheseR.getSource()); tmpFile.delete(); tmpFileEle.delete(); tmpFileBth.delete(); } public CorEleBthInterface getInter(File _f) { FileOperationSynthese syntheseR= CorEleBthFileFormat.getInstance().getLastVersionImpl().read(_f, null); if(syntheseR.getAnalyze()!=null) syntheseR.getAnalyze().printResume(); assertTrue(syntheseR.getAnalyze().isEmpty()); return (CorEleBthInterface)syntheseR.getSource(); } /** * Test de lecture */ public void testLecture() { _interfaceTest(getInter(fic_)); } } --- NEW FILE: TestJCrb.java --- (This appears to be a binary file; contents omitted.) Index: TestRefluxParametres.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/reflux/TestRefluxParametres.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TestRefluxParametres.java 25 Nov 2003 10:12:02 -0000 1.4 --- TestRefluxParametres.java 5 Mar 2004 15:18:25 -0000 1.5 *************** *** 9,15 **** package org.fudaa.dodico.test.reflux; import org.fudaa.dodico.h2d.reflux.H2dRefluxBoundaryConditionMutable; - import org.fudaa.dodico.h2d.type.H2dBoundaryType; import org.fudaa.dodico.reflux.io.INPAdapter; ! import org.fudaa.dodico.test.h2d.TestMaillage; /** * @author deniger --- 9,14 ---- package org.fudaa.dodico.test.reflux; import org.fudaa.dodico.h2d.reflux.H2dRefluxBoundaryConditionMutable; import org.fudaa.dodico.reflux.io.INPAdapter; ! import org.fudaa.dodico.test.h2d.TestJMaillage; /** * @author deniger *************** *** 23,27 **** super(); INPAdapter inter= new INPAdapter(); ! inter.setMaillage(TestMaillage.createMaillage()); H2dRefluxBoundaryConditionMutable[] cl= new H2dRefluxBoundaryConditionMutable[6]; --- 22,26 ---- super(); INPAdapter inter= new INPAdapter(); ! inter.setMaillage(TestJMaillage.createMaillage()); H2dRefluxBoundaryConditionMutable[] cl= new H2dRefluxBoundaryConditionMutable[6]; --- TestCLTransitoire.java DELETED --- --- TestCrb.java DELETED --- --- TestINP.java DELETED --- --- TestDunes.java DELETED --- --- TestCorEleBth.java DELETED --- |
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/telemac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19764/src/org/fudaa/dodico/test/telemac Added Files: TestJCL.java TestJCas.java TestJLiquide.java TestJClMng.java TestJSinusx.java TestJSerafin.java TestJTrigrid.java Removed Files: TestCL.java TestClMng.java TestTrigrid.java TestCas.java TestSinusx.java TestSerafin.java TestLiquide.java Log Message: Renommer les fichiers Test en TestJ --- NEW FILE: TestJCL.java --- /* * @file TestSerafin.java * @creation 2002-11-20 * @modification $Date: 2004/03/05 15:18:24 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail de...@fu... */ package org.fudaa.dodico.test.telemac; import java.io.File; import org.fudaa.dodico.fichiers.FileOperationSynthese; import org.fudaa.dodico.h2d.telemac.H2dTelemacCLElementSource; import org.fudaa.dodico.h2d.telemac.H2dTelemacCLSourceInterface; import org.fudaa.dodico.h2d.type.H2dBcType; import org.fudaa.dodico.h2d.type.H2dBoundaryType; import org.fudaa.dodico.telemac.io.TelemacCLFileFormat; import org.fudaa.dodico.test.TestIO; /** * @version $Id: TestJCL.java,v 1.1 2004/03/05 15:18:24 deniger Exp $ * @author Fred Deniger */ public class TestJCL extends TestIO { /** * test.cli */ public TestJCL() { super("test.cli"); } protected synchronized void _interfaceTest(H2dTelemacCLSourceInterface _inter) { assertNotNull(_inter); int idx= 0; H2dTelemacCLElementSource s= new H2dTelemacCLElementSource(); _inter.getLine(idx, s); assertEquals(s.bordType_, H2dBoundaryType.LIQUIDE_ONDE_INCIDENCE); //assertEquals(s.hType_, H2dClType.LIBRE); assertEquals(s.uType_, H2dBcType.LIBRE); assertEquals(s.vType_, H2dBcType.LIBRE); assertEquals(s.tracerType_, H2dBcType.LIBRE); _inter.getLine(++idx, s); assertEquals(s.bordType_, H2dBoundaryType.SOLIDE); //assertEquals(s.hType_, H2dClType.LIBRE); assertEquals(s.uType_, H2dBcType.PERMANENT); assertEquals(s.u_, 0, eps_); assertEquals(s.vType_, H2dBcType.LIBRE); assertEquals(s.tracerType_, H2dBcType.LIBRE); _inter.getLine(++idx, s); assertEquals(s.bordType_, H2dBoundaryType.SOLIDE); //assertEquals(s.hType_, H2dClType.LIBRE); assertEquals(s.uType_, H2dBcType.LIBRE); assertEquals(s.vType_, H2dBcType.PERMANENT); assertEquals(s.v_, 0, eps_); assertEquals(s.tracerType_, H2dBcType.LIBRE); _inter.getLine(++idx, s); assertEquals(s.bordType_, H2dBoundaryType.SOLIDE); //assertEquals(s.hType_, H2dClType.LIBRE); assertEquals(s.uType_, H2dBcType.LIBRE); assertEquals(s.vType_, H2dBcType.LIBRE); assertEquals(s.tracerType_, H2dBcType.LIBRE); _inter.getLine(++idx, s); assertEquals(s.bordType_, H2dBoundaryType.LIQUIDE_DEBIT_IMPOSE); //assertEquals(s.hType_, H2dClType.LIBRE); assertEquals(s.uType_, H2dBcType.LIBRE); assertEquals(s.vType_, H2dBcType.LIBRE); assertEquals(s.tracerType_, H2dBcType.PERMANENT); _inter.getLine(++idx, s); assertEquals(s.bordType_, H2dBoundaryType.LIQUIDE_DEBIT_IMPOSE); //assertEquals(s.hType_, H2dClType.LIBRE); assertEquals(s.uType_, H2dBcType.LIBRE); assertEquals(s.vType_, H2dBcType.PERMANENT); assertEquals(s.v_, 0, eps_); assertEquals(s.tracerType_, H2dBcType.PERMANENT); _inter.getLine(++idx, s); assertEquals(s.bordType_, H2dBoundaryType.LIQUIDE_DEBIT_IMPOSE); //assertEquals(s.hType_, H2dClType.LIBRE); assertEquals(s.uType_, H2dBcType.PERMANENT); assertEquals(s.u_, 0, eps_); assertEquals(s.vType_, H2dBcType.LIBRE); assertEquals(s.tracerType_, H2dBcType.PERMANENT); _inter.getLine(++idx, s); assertEquals(s.bordType_, H2dBoundaryType.LIQUIDE_DEBIT_IMPOSE); //assertEquals(s.hType_, H2dClType.PERMANENT); assertEquals(s.uType_, H2dBcType.LIBRE); assertEquals(s.vType_, H2dBcType.LIBRE); assertEquals(s.tracerType_, H2dBcType.PERMANENT); _inter.getLine(++idx, s); assertEquals( s.bordType_, H2dBoundaryType.LIQUIDE_HAUTEUR_VITESSES_IMPOSEES); //assertEquals(s.hType_, H2dClType.PERMANENT); assertEquals(s.uType_, H2dBcType.LIBRE); assertEquals(s.vType_, H2dBcType.PERMANENT); assertEquals(s.v_, 0, eps_); assertEquals(s.tracerType_, H2dBcType.LIBRE); _inter.getLine(++idx, s); assertEquals( s.bordType_, H2dBoundaryType.LIQUIDE_HAUTEUR_VITESSES_IMPOSEES); //assertEquals(s.hType_, H2dClType.PERMANENT); assertEquals(s.uType_, H2dBcType.PERMANENT); assertEquals(s.u_, 0, eps_); assertEquals(s.vType_, H2dBcType.LIBRE); assertEquals(s.tracerType_, H2dBcType.LIBRE); _inter.getLine(++idx, s); assertEquals(s.bordType_, H2dBoundaryType.LIQUIDE_VITESSES_IMPOSEES); //assertEquals(s.hType_, H2dClType.LIBRE); assertEquals(s.uType_, H2dBcType.PERMANENT); assertEquals(s.vType_, H2dBcType.PERMANENT); assertEquals(s.tracerType_, H2dBcType.PERMANENT); _inter.getLine(++idx, s); assertEquals(s.bordType_, H2dBoundaryType.LIQUIDE_HAUTEUR_IMPOSEE); //assertEquals(s.hType_, H2dClType.PERMANENT); assertEquals(s.uType_, H2dBcType.LIBRE); assertEquals(s.vType_, H2dBcType.LIBRE); assertEquals(s.tracerType_, H2dBcType.LIBRE); _inter.getLine(++idx, s); assertEquals( s.bordType_, H2dBoundaryType.LIQUIDE_HAUTEUR_VITESSES_IMPOSEES); //assertEquals(s.hType_, H2dClType.PERMANENT); assertEquals(s.uType_, H2dBcType.PERMANENT); assertEquals(s.vType_, H2dBcType.PERMANENT); assertEquals(s.tracerType_, H2dBcType.PERMANENT); _inter.getLine(++idx, s); assertEquals(s.bordType_, H2dBoundaryType.LIQUIDE_VITESSES_IMPOSEES); //assertEquals(s.hType_, H2dClType.LIBRE); assertEquals(s.uType_, H2dBcType.PERMANENT); assertEquals(s.vType_, H2dBcType.PERMANENT); assertEquals(s.v_, 0, eps_); assertEquals(s.tracerType_, H2dBcType.PERMANENT); _inter.getLine(++idx, s); assertEquals(s.bordType_, H2dBoundaryType.LIQUIDE_VITESSES_IMPOSEES); //assertEquals(s.hType_, H2dClType.LIBRE); assertEquals(s.uType_, H2dBcType.PERMANENT); assertEquals(s.u_, 0, eps_); assertEquals(s.vType_, H2dBcType.PERMANENT); assertEquals(s.tracerType_, H2dBcType.PERMANENT); _inter.getLine(++idx, s); assertEquals(s.bordType_, H2dBoundaryType.SOLIDE); //assertEquals(s.hType_, H2dClType.LIBRE); assertEquals(s.uType_, H2dBcType.PERMANENT); assertEquals(s.u_, 0, eps_); assertEquals(s.vType_, H2dBcType.PERMANENT); assertEquals(s.v_, 0, eps_); assertEquals(s.tracerType_, H2dBcType.LIBRE); _inter.getLine(++idx, s); assertEquals(s.bordType_, H2dBoundaryType.LIQUIDE_DEBIT_IMPOSE); //assertEquals(s.hType_, H2dClType.PERMANENT); assertEquals(s.uType_, H2dBcType.PERMANENT); assertEquals(s.u_, 0, eps_); assertEquals(s.vType_, H2dBcType.LIBRE); assertEquals(s.tracerType_, H2dBcType.PERMANENT); _inter.getLine(++idx, s); assertEquals(s.bordType_, H2dBoundaryType.LIQUIDE); assertEquals(s.uType_, H2dBcType.LIBRE); assertEquals(s.vType_, H2dBcType.LIBRE); assertEquals(s.tracerType_, H2dBcType.PERMANENT); int l= _inter.getNbLines(); assertEquals(18, l); for (int i= 0; i < l; i++) { _inter.getLine(i, s); //les valeurs assertEquals(s.h_, 100 + i, eps_); if ((i == 1) || (i == 6) || (i == 9) || (i == 14) || (i == 15) || (i == 16)) { assertEquals(s.u_, 0, eps_); } else { assertEquals(s.u_, 200 + i, eps_); } if ((i == 2) || (i == 5) || (i == 8) || (i == 13) || (i == 15)) { assertEquals(s.v_, 0, eps_); } else { assertEquals(s.v_, 300 + i, eps_); } assertEquals(s.friction_, 400 + i, eps_); assertEquals(s.tracer_, 500 + i, eps_); assertEquals(s.tracerCoefA_, 600 + i, eps_); assertEquals(s.tracerCoefB_, 700 + i, eps_); //les indices commencent a 0. assertEquals(s.ptGlobalIdx_, 799 + i, eps_); } } /** * */ public void testEcriture() { H2dTelemacCLSourceInterface inter= getInter(fic_); File tmpFile= createTempFile(); FileOperationSynthese syntheseR= TelemacCLFileFormat.getInstance().getLastVersionImpl().writeMaillage( tmpFile, inter, null); if (syntheseR.containsMessages()) syntheseR.getAnalyze().printResume(); assertFalse(syntheseR.containsMessages()); _interfaceTest(getInter(tmpFile)); } protected H2dTelemacCLSourceInterface getInter(File _f) { FileOperationSynthese syntheseR= TelemacCLFileFormat.getInstance().getLastVersionImpl().read(_f, null); H2dTelemacCLSourceInterface r= (H2dTelemacCLSourceInterface)syntheseR.getSource(); assertFalse(syntheseR.containsMessages()); return r; } /** * */ public void testLecture() { _interfaceTest(getInter(fic_)); } } --- NEW FILE: TestJCas.java --- /* * @file TestCas.java * @creation 28 avr. 2003 * @modification $Date: 2004/03/05 15:18:24 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail de...@fu... */ package org.fudaa.dodico.test.telemac; import java.io.File; import org.fudaa.dodico.dico.DicoCasInterface; import org.fudaa.dodico.dico.DicoEntite; import org.fudaa.dodico.dico.DicoModelAbstract; import org.fudaa.dodico.fichiers.FileOperationSynthese; import org.fudaa.dodico.telemac.io.Telemac2dFileFormat; import org.fudaa.dodico.test.TestIO; /** * @author deniger * @version $Id: TestJCas.java,v 1.1 2004/03/05 15:18:24 deniger Exp $ */ public class TestJCas extends TestIO { /** * fichier cas.txt */ public TestJCas() { super("cas.txt"); } /** * @param _r interface a tester */ public void _interfaceTest(DicoCasInterface _r) { DicoCasInterface inter = _r; assertEquals(inter.getNbInput(), 28); DicoModelAbstract dico = Telemac2dFileFormat.getInstance().getLastVersionImpl().getDico(); DicoEntite ent = dico.getEntite("CONDITIONS INITIALES"); String t = inter.getValue(ent); assertNotNull(ent); assertEquals(t, "HAUTEUR NULLE"); ent = dico.getEntite("DEBITS IMPOSES"); assertNotNull(ent); t = inter.getValue(ent); assertEquals(t, "0.;0."); ent = dico.getEntite("DUREE DU CALCUL"); assertNotNull(ent); t = inter.getValue(ent); assertEquals(t, "1600"); ent = dico.getEntite("FICHIER DES PARAMETRES"); assertNotNull(ent); t = inter.getCommentaire(ent); assertNotNull(t); assertEquals("LE FICHIER QUI VA BIEN", t); } /** * Test de l'ecriture du fichier */ public void testEcriture() { DicoCasInterface inter = getInter(fic_); File tmpFile = createTempFile(); FileOperationSynthese syntheseR = Telemac2dFileFormat.getInstance().getLastVersionImpl().write( tmpFile, inter, null); assertFalse(syntheseR.containsMessages()); _interfaceTest(getInter(tmpFile)); } /** * @param _f * @return l'interace correspodant a _f */ public DicoCasInterface getInter(File _f) { FileOperationSynthese syntheseR = Telemac2dFileFormat.getInstance().getLastVersionImpl().read(_f, null); DicoCasInterface r = (DicoCasInterface) syntheseR.getSource(); if (syntheseR.containsMessages()) { syntheseR.getAnalyze().printResume("Message: "); } assertFalse(syntheseR.containsMessages()); return r; } /** * Test la lecture de cas.txt */ public void testLecture() { _interfaceTest(getInter(fic_)); assertTrue( Telemac2dFileFormat .getInstance() .getLastVersionImpl() .createDicoCasReader() .testFile(fic_)); } } --- NEW FILE: TestJLiquide.java --- /* * @file TestLiquide.java * @creation 15 avr. 2003 * @modification $Date: 2004/03/05 15:18:24 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail de...@fu... */ package org.fudaa.dodico.test.telemac; import java.io.File; import org.fudaa.dodico.fichiers.FileOperationSynthese; import org.fudaa.dodico.h2d.H2dEvolutionFrontiereLiquide; import org.fudaa.dodico.h2d.type.H2dVariableType; import org.fudaa.dodico.telemac.io.TelemacLiquideFileFormat; import org.fudaa.dodico.telemac.io.TelemacLiquideInterface; import org.fudaa.dodico.test.TestIO; /** * @author deniger * @version $Id: TestJLiquide.java,v 1.1 2004/03/05 15:18:24 deniger Exp $ */ public class TestJLiquide extends TestIO { public TestJLiquide() { super("liquide.liq"); } /** * @see org.fudaa.dodico.test.TestIO#_interfaceTest(org.fudaa.dodico.tr.TrFileReadView) */ public void _interfaceTest(TelemacLiquideInterface _inter) { assertNotNull(_inter); assertEquals(2, _inter.getNbEvolutionsFrontiereLiquide()); H2dEvolutionFrontiereLiquide[] fs= _inter.getEvolutionsFrontieresLiquides(); H2dEvolutionFrontiereLiquide fsi= fs[0]; assertEquals(1, fsi.getIndexFrontiere()); assertEquals("m3/s", fsi.getUnite()); assertEquals(H2dVariableType.DEBIT, fsi.getVariableType()); assertEquals(5, fsi.getPasTempNb()); assertEquals(0, fsi.getPasDeTemps(0), eps_); assertEquals(1800, fsi.getPasDeTemps(1), eps_); assertEquals(50000, fsi.getPasDeTemps(2), eps_); assertEquals(50002, fsi.getPasDeTemps(3), eps_); assertEquals(50003, fsi.getPasDeTemps(4), eps_); assertEquals(5, fsi.getPasTempNb()); assertEquals(0, fsi.getValue(0), eps_); assertEquals(500, fsi.getValue(1), eps_); assertEquals(501, fsi.getValue(2), eps_); assertEquals(503, fsi.getValue(4), eps_); fsi= fs[1]; assertEquals(0, fsi.getIndexFrontiere()); assertEquals("m", fsi.getUnite()); assertEquals(H2dVariableType.COTE_EAU, fsi.getVariableType()); assertEquals(5, fsi.getPasTempNb()); assertEquals(0, fsi.getPasDeTemps(0), eps_); assertEquals(1800, fsi.getPasDeTemps(1), eps_); assertEquals(50000, fsi.getPasDeTemps(2), eps_); assertEquals(263, fsi.getValue(0), eps_); assertEquals(264, fsi.getValue(1), eps_); assertEquals(265, fsi.getValue(2), eps_); assertEquals(263, fsi.getValue(4), eps_); } /** * */ public void testEcriture() { TelemacLiquideInterface inter= getInter(fic_); File tmpFile= createTempFile(); FileOperationSynthese syntheseR= TelemacLiquideFileFormat .getInstance() .getLastVersionImpl() .writeClLiquid( tmpFile, inter, null); assertFalse(syntheseR.containsMessages()); _interfaceTest(getInter(tmpFile)); } public TelemacLiquideInterface getInter(File _f) { FileOperationSynthese syntheseR= TelemacLiquideFileFormat.getInstance().getLastVersionImpl().read( _f, null); TelemacLiquideInterface r= (TelemacLiquideInterface)syntheseR.getSource(); assertFalse(syntheseR.containsMessages()); return r; } /** * */ public void testLecture() { _interfaceTest(getInter(fic_)); } } --- NEW FILE: TestJClMng.java --- /* * @file TestClMng.java * @creation 10 sept. 2003 * @modification $Date: 2004/03/05 15:18:24 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail de...@fu... */ package org.fudaa.dodico.test.telemac; import java.io.File; import junit.framework.TestCase; import org.fudaa.dodico.ef.EfFrontier; import org.fudaa.dodico.ef.EfGrid; import org.fudaa.dodico.fichiers.FileOperationSynthese; import org.fudaa.dodico.h2d.H2dBcFrontierBlockInterface; import org.fudaa.dodico.h2d.telemac.H2dTelemacBcManager; import org.fudaa.dodico.h2d.telemac.H2dTelemacBoundary; import org.fudaa.dodico.h2d.telemac.H2dTelemacCLElementSource; import org.fudaa.dodico.h2d.telemac.H2dTelemacCLSourceInterface; import org.fudaa.dodico.h2d.type.H2dBcType; import org.fudaa.dodico.h2d.type.H2dBoundaryType; import org.fudaa.dodico.telemac.io.SerafinFileFormat; import org.fudaa.dodico.telemac.io.SerafinInterface; import org.fudaa.dodico.telemac.io.TelemacCLFileFormat; import org.fudaa.dodico.test.TestIO; /** * @author deniger * @version $Id: TestJClMng.java,v 1.1 2004/03/05 15:18:24 deniger Exp $ */ public class TestJClMng extends TestCase { EfGrid m_; H2dTelemacCLSourceInterface cl_; /** * Constructeur: lit les fichiers "testClMng...." */ public TestJClMng() { Class c = getClass(); File geoFile = TestIO.getFile(c, "testClMng.ser"); File cliFile = TestIO.getFile(c, "testClMng.cli"); FileOperationSynthese op = SerafinFileFormat.getInstance().getLastVersionImpl().read(geoFile, null); assertFalse(op.containsFatalError()); SerafinInterface inter = (SerafinInterface) op.getSource(); m_ = inter.getGrid(); EfGrid.computeBord(m_, inter.getPtsFrontiere(), null); op = TelemacCLFileFormat.getInstance().getLastVersionImpl().read( cliFile, null); assertFalse(op.containsFatalError()); cl_ = ((H2dTelemacCLSourceInterface) op.getSource()); } /** * Test le maillage : frontiere,noeuds et elements */ public void testMaillage() { assertNotNull(m_); assertNotNull(m_.getFrontiers()); EfFrontier frontiere = m_.getFrontiers(); assertEquals(2, frontiere.getNbFrontier()); //test extern frontier assertEquals(282, frontiere.getNbPt(0)); assertEquals(13, frontiere.getIdxGlobalPrinc(0)); assertEquals(28, frontiere.getIdxGlobalPrinc(281)); //test intern frontier assertEquals(16, frontiere.getNbPt(1)); assertEquals(232, frontiere.getIdxGlobal(1, 0)); assertEquals(23, frontiere.getIdxGlobal(1, 15)); } /** * Test les conditions lu */ public void testCl() { _testCl(cl_); } private static void _testCl(H2dTelemacCLSourceInterface _cl) { assertEquals(298, _cl.getNbLines()); H2dTelemacCLElementSource s = new H2dTelemacCLElementSource(); /** extern frontier* */ //bord 0 for (int i = 270; i < 282; i++) { _cl.getLine(i, s); assertEquals(H2dBoundaryType.LIQUIDE_DEBIT_IMPOSE, s.bordType_); } _cl.getLine(0, s); assertEquals(H2dBoundaryType.LIQUIDE_DEBIT_IMPOSE, s.bordType_); // bord 1 for (int i = 1; i < 138; i++) { _cl.getLine(i, s); assertEquals(H2dBoundaryType.SOLIDE, s.bordType_); } // bord 2 for (int i = 138; i < 149; i++) { _cl.getLine(i, s); assertEquals(H2dBoundaryType.LIQUIDE_HAUTEUR_IMPOSEE, s.bordType_); } // bord 3 for (int i = 149; i < 270; i++) { _cl.getLine(i, s); assertEquals(H2dBoundaryType.SOLIDE, s.bordType_); } /** intern frontier* */ for (int i = 282; i < 298; i++) { _cl.getLine(i, s); assertEquals(H2dBoundaryType.SOLIDE, s.bordType_); } } /** * Test H2dtelemacBcManager */ public void testClMng() { H2dTelemacBcManager clMng = H2dTelemacBcManager.init(m_, cl_, null, null); assertNotNull(clMng); assertEquals(2, clMng.getNbBcFrontier()); /** extern frontier* */ H2dBcFrontierBlockInterface bord = clMng.getBlockFrontier(0); assertEquals(4, bord.getNbBord()); //bord 0 H2dTelemacBoundary b = (H2dTelemacBoundary) bord.getBord(0); assertEquals(H2dBoundaryType.SOLIDE, b.getType()); assertEquals(0, b.getIdxDeb()); assertEquals(138, b.getIdxFin()); assertEquals(H2dBcType.LIBRE, b.getTracerType()); // bord 1 b = (H2dTelemacBoundary) bord.getBord(1); assertEquals(H2dBoundaryType.LIQUIDE_HAUTEUR_IMPOSEE, b.getType()); assertEquals(138, b.getIdxDeb()); assertEquals(148, b.getIdxFin()); // bord 2 b = (H2dTelemacBoundary) bord.getBord(2); assertEquals(H2dBoundaryType.SOLIDE, b.getType()); assertEquals(148, b.getIdxDeb()); assertEquals(270, b.getIdxFin()); // bord 3 b = (H2dTelemacBoundary) bord.getBord(3); assertEquals(H2dBoundaryType.LIQUIDE_DEBIT_IMPOSE, b.getType()); assertEquals(270, b.getIdxDeb()); assertEquals(0, b.getIdxFin()); assertEquals(H2dBcType.PERMANENT, b.getTracerType()); //intern frontier bord = clMng.getBlockFrontier(1); assertEquals(1, bord.getNbBord()); assertEquals(H2dBoundaryType.SOLIDE, bord.getBord(0).getType()); assertEquals(0, bord.getBord(0).getIdxDeb()); assertEquals(0, bord.getBord(0).getIdxFin()); assertEquals( H2dBcType.LIBRE, ((H2dTelemacBoundary) bord.getBord(0)).getTracerType()); for (int i = 270; i < 282; i++) { assertEquals( H2dBoundaryType.LIQUIDE_DEBIT_IMPOSE, clMng.getBordFromIdxOnFrontier(i).getType()); } H2dTelemacCLElementSource s = new H2dTelemacCLElementSource(); cl_.getLine(0, s); assertEquals(H2dBoundaryType.LIQUIDE_DEBIT_IMPOSE, s.bordType_); // bord 1 for (int i = 1; i < 138; i++) { assertEquals( H2dBoundaryType.SOLIDE, clMng.getBordFromIdxOnFrontier(i).getType()); } // bord 2 for (int i = 138; i < 149; i++) { assertEquals( H2dBoundaryType.LIQUIDE_HAUTEUR_IMPOSEE, clMng.getBordFromIdxOnFrontier(i).getType()); } // bord 3 for (int i = 149; i < 270; i++) { assertEquals( H2dBoundaryType.SOLIDE, clMng.getBordFromIdxOnFrontier(i).getType()); } /** intern frontier* */ for (int i = 282; i < 298; i++) { assertEquals( H2dBoundaryType.SOLIDE, clMng.getBordFromIdxOnFrontier(i).getType()); } _testCl(clMng.createCLSourceInterface()); } } --- NEW FILE: TestJSinusx.java --- /* * @file TestSinusx.java * @creation 2002-11-05 * @modification $Date: 2004/03/05 15:18:24 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail de...@fu... */ package org.fudaa.dodico.test.telemac; import java.io.File; import java.io.IOException; import java.net.URL; import junit.framework.TestCase; import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.fichiers.FileOperationSynthese; import org.fudaa.dodico.mnt.ListMNTPoint; import org.fudaa.dodico.mnt.MNTCsvReader; import org.fudaa.dodico.mnt.MNTCsvWriter; import org.fudaa.dodico.mnt.MNTPointMutable; import org.fudaa.dodico.mnt.MNTPolyligne; import org.fudaa.dodico.mnt.MNTSemis; import org.fudaa.dodico.mnt.MNTZone; import org.fudaa.dodico.telemac.io.SinusxFileFormat; /** * @version $Id: TestJSinusx.java,v 1.1 2004/03/05 15:18:24 deniger Exp $ * @author Fred Deniger */ public class TestJSinusx extends TestCase { /** * Le fichier de lecture */ String testLectureFic_; double delta; /** * Constructeur par defaut */ public TestJSinusx() {} /** * @see junit.framework.TestCase#setUp() */ public void setUp() { testLectureFic_= "simple.sx"; delta= 1E-15; } /** * @param _f * @return Les zones lues * @throws NumberFormatException */ private MNTZone[] lecture(File _f) throws NumberFormatException { assertNotNull(_f); assertTrue(_f.exists()); FileOperationSynthese op= SinusxFileFormat.getInstance().getLastVersionInstance().read(_f, null); MNTZone[] zones= (MNTZone[])op.getSource(); assertEquals(1, zones.length); MNTZone zone= zones[0]; assertEquals(zone.getNom(), DodicoLib.getSansExtension(_f.getName())); assertEquals(zone.getNbPointsSemis(), 5); MNTPointMutable p= new MNTPointMutable(); double t; MNTSemis semis= zone.getSemis(); assertNotNull(semis); for (int i= 0; i < 5; i++) { semis.getPoint(p, i); t= i; assertEquals(p.getX(), t, delta); assertEquals(p.getY(), t, delta); assertEquals(p.getZ(), t, delta); } assertEquals(zone.getNbPolylignes(), 2); MNTPolyligne poly= zone.getPolyligne(0); assertEquals(poly.getNbPoints(), 4); assertEquals(poly.getNom(), "courbe"); p= new MNTPointMutable(-1d, -1d, -1d); for (int i= 0; i < 4; i++) { poly.getPoint(p, i); t= (double)i * 5; assertEquals(p.getX(), t, delta); assertEquals(p.getY(), t, delta); assertEquals(p.getZ(), t, delta); } poly= zone.getPolyligne(1); assertEquals(poly.getNbPoints(), 2); assertEquals(poly.getNom(), "niveau"); p= new MNTPointMutable(-1, -1, -1); for (int i= 0; i < 2; i++) { poly.getPoint(p, i); t= (double)i * 100 + 100; assertEquals(p.getX(), t, delta); assertEquals(p.getY(), t, delta); assertEquals(p.getZ(), t, delta); } return zones; } /**A unit test for JUnit */ public void testLectureEcriture() { File f= null; try { File initFile= getFile(testLectureFic_); assertNotNull(initFile); MNTZone[] zones= lecture(initFile); assertNotNull(zones); f= File.createTempFile("testSinux", ".sx"); assertNotNull(f); SinusxFileFormat.getInstance().getLastVersionInstance().write( f, zones, null); lecture(f); } catch (Exception _e) { _e.printStackTrace(); } finally { if (f != null) { f.delete(); } } } /** * @param _f * @return File */ public File getFile(String _f) { URL url= getClass().getResource(_f); if (url == null) return null; return new File(url.getPath()); } /** * Test sur le fichier cvs1.txt */ public void testMNTCsv() { File f= getFile("csv1.txt"); assertNotNull(f); MNTCsvReader reader= new MNTCsvReader(); reader.setFile(f); assertEquals(";", reader.getSepChar()); FileOperationSynthese s= reader.read(); ListMNTPoint l= (ListMNTPoint)s.getSource(); assertEquals(3, l.nombre()); assertEquals(1, l.renvoieX(0), 1e-15); assertEquals(2, l.renvoieY(0), 1e-15); assertEquals(3, l.renvoieZ(0), 1e-15); assertEquals(3, l.renvoieX(1), 1e-15); assertEquals(4, l.renvoieY(1), 1e-15); assertEquals(5, l.renvoieZ(1), 1e-15); assertEquals(7, l.renvoieX(2), 1e-15); assertEquals(8, l.renvoieY(2), 1e-15); assertEquals(0, l.renvoieZ(2), 1e-15); f= getFile("csv2.txt"); assertNotNull(f); reader= new MNTCsvReader(); reader.setFile(f); assertEquals("\t", reader.getSepChar()); s= reader.read(); l= (ListMNTPoint)s.getSource(); assertEquals(3, l.nombre()); assertEquals(1, l.renvoieX(0), 1e-15); assertEquals(2, l.renvoieY(0), 1e-15); assertEquals(3, l.renvoieZ(0), 1e-15); assertEquals(3, l.renvoieX(1), 1e-15); assertEquals(4, l.renvoieY(1), 1e-15); assertEquals(5, l.renvoieZ(1), 1e-15); assertEquals(7, l.renvoieX(2), 1e-15); assertEquals(8, l.renvoieY(2), 1e-15); assertEquals(0, l.renvoieZ(2), 1e-15); File fW= null; try { fW= File.createTempFile("fudaa", ".sx"); } catch (IOException e) { e.printStackTrace(); } if (fW != null) { MNTCsvWriter w= new MNTCsvWriter(); w.setFile(fW); w.setSep("\t"); w.write(l); reader= new MNTCsvReader(); reader.setFile(fW); s= reader.read(); assertEquals("\t", reader.getSepChar()); l= (ListMNTPoint)s.getSource(); assertEquals(3, l.nombre()); assertEquals(1, l.renvoieX(0), 1e-15); assertEquals(2, l.renvoieY(0), 1e-15); assertEquals(3, l.renvoieZ(0), 1e-15); assertEquals(3, l.renvoieX(1), 1e-15); assertEquals(4, l.renvoieY(1), 1e-15); assertEquals(5, l.renvoieZ(1), 1e-15); assertEquals(7, l.renvoieX(2), 1e-15); assertEquals(8, l.renvoieY(2), 1e-15); assertEquals(0, l.renvoieZ(2), 1e-15); fW.delete(); } } } --- NEW FILE: TestJSerafin.java --- /* * @file TestSerafin.java * @creation 2002-11-20 * @modification $Date: 2004/03/05 15:18:24 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail de...@fu... */ package org.fudaa.dodico.test.telemac; import java.io.File; import org.fudaa.dodico.ef.EfElementType; import org.fudaa.dodico.ef.EfFrontier; import org.fudaa.dodico.ef.EfGrid; import org.fudaa.dodico.fichiers.FileOperationSynthese; import org.fudaa.dodico.telemac.io.SerafinFileFormat; import org.fudaa.dodico.telemac.io.SerafinInterface; import org.fudaa.dodico.telemac.io.SerafinWriter; import org.fudaa.dodico.test.TestIO; /** * @version $Id: TestJSerafin.java,v 1.1 2004/03/05 15:18:24 deniger Exp $ * @author Fred Deniger */ public class TestJSerafin extends TestIO { SerafinInterface inter_; /** * exemple.res */ public TestJSerafin() { super("exemple.res"); inter_ = getInter(fic_); } protected void _interfaceTest(SerafinInterface _t) { assertNotNull(_t); //TITRE assertEquals( _t.getTitre(), "MODELE MARITIME - CALCUL1 SERAPHIN"); //NBV1 assertEquals(_t.getValueNb(), 6); //TEXT String temp = _t.getValueId(0); assertEquals(temp, "VITESSE U"); temp = _t.getValueId(5); assertEquals(temp, "VITESSE SCALAIRE"); //LUNIT temp = _t.getUnite(1); assertEquals(temp, "M/S"); temp = _t.getUnite(4); assertEquals(temp, "M"); //IPARAM assertEquals(_t.getIparam()[0], 1); //IDATE assertEquals(_t.getIdate(), 0); //NELEM EfGrid maillage = _t.getGrid(); assertEquals(maillage.getEltNb(), 3087); //NPOIN1 assertEquals(maillage.getPtsNb(), 1676); //NPPEL1 assertEquals(maillage.getEltType(), EfElementType.T3); //IKLE1 assertEquals(maillage.getElement(0).getPtIndex(1), 1545); assertEquals( maillage.getElement(maillage.getEltNb() - 1).getPtIndex(0), 219); //IPOBO1 assertEquals(_t.getPtsFrontiere()[0], 4); assertEquals(_t.getPtsFrontiere()[1], 226); //X1 assertEquals( maillage.getPt(9).getX(), Float.intBitsToFloat(1160462115), eps_); //Y1 assertEquals( maillage.getPt(11).getY(), Float.intBitsToFloat(1140111573), eps_); //Nombre de pas temps int tempInt = _t.getTimeStepNb(); assertEquals(tempInt, 2); double tempDouble = _t.getTimeStep(1); assertEquals(tempDouble, Float.intBitsToFloat(1153138688), eps_); //pas de temps 1, variable 3 //premiere variable assertEquals( _t.getValue(2, 0, 0), Float.intBitsToFloat(1076258406), eps_); //pas de temps 2, variable 4 //derniere variable assertEquals( _t.getValue(3, maillage.getPtsNb() - 1, 1), (double) Float.intBitsToFloat(1093124747), eps_); } /** * @see org.fudaa.dodico.test.TestIO#testEcriture() */ public void testEcriture() { SerafinInterface inter = inter_; File tmpFile = createTempFile(); SerafinWriter w = SerafinFileFormat .getInstance() .getLastVersionImpl() .createSerafinWriter(); w.setMachineSPARC(); w.setFile(tmpFile); FileOperationSynthese syntheseR = w.write(inter); assertFalse(syntheseR.getAnalyze().containsErrors()); _interfaceTest(getInter(tmpFile)); } protected SerafinInterface getInter(File _f) { FileOperationSynthese syntheseR = SerafinFileFormat.getInstance().getLastVersionImpl().read(_f, null); SerafinInterface r = (SerafinInterface) syntheseR.getSource(); assertFalse(syntheseR.getAnalyze().containsErrors()); return r; } /** * Test la frontiere */ public void testRechercheFrontiereWithIpobo() { SerafinInterface inter = inter_; EfGrid.computeBordFast(inter.getGrid(), inter.getPtsFrontiere(), null); EfFrontier b = inter.getGrid().getFrontiers(); assertEquals(b.getNbFrontierIntern(), 1); } /** * Test de 2 methodes pour la frontiere */ public void testRechercheFrontiereinterne() { SerafinInterface inter = inter_; inter.getGrid().computeBord(null); assertTrue( inter.getGrid().getFrontiers().isSame(inter.getPtsFrontiere())); } /** * Lecture..; */ public void testLecture() { _interfaceTest(inter_); } } --- NEW FILE: TestJTrigrid.java --- /* * @file TestTrigrid.java * @creation 27 janv. 2004 * @modification $Date: 2004/03/05 15:18:24 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail de...@fu... */ package org.fudaa.dodico.test.telemac; import java.io.File; import org.fudaa.dodico.commun.DodicoAnalyze; import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.ef.EfElement; import org.fudaa.dodico.ef.EfGrid; import org.fudaa.dodico.ef.EfGridSource; import org.fudaa.dodico.ef.EfLib; import org.fudaa.dodico.ef.EfNode; import org.fudaa.dodico.telemac.io.SerafinFileFormat; import org.fudaa.dodico.test.TestIO; import org.fudaa.dodico.trigrid.TrigridFileFormat; /** * @author deniger * @version $Id: TestJTrigrid.java,v 1.1 2004/03/05 15:18:24 deniger Exp $ */ public class TestJTrigrid extends TestIO { EfGrid g_; /** * trigrid.ngh */ public TestJTrigrid() { super("trigrid.ngh"); g_ = ( (EfGridSource) TrigridFileFormat .getInstance() .getLastVersionImpl() .readGrid(fic_, null) .getSource()).getGrid(); } /** * */ public void testEcriture() { File f = createTempFile(); TrigridFileFormat.getInstance().getLastVersionImpl().write( f, g_, null); System.out.println(f.getAbsolutePath()); EfGrid g = ((EfGridSource) TrigridFileFormat .getInstance() .getLastVersionImpl() .readGrid(f, null) .getSource()).getGrid(); f.delete(); internTestGridWriter(g); } /** * Un test assez long sur le lecture de fichier serafin: <br>1- test de la conformite du * maillage lu <br>2- Comparaison avec un maillage equivalent issu du fichier serafin * "trigrid.geo" 3- Test pour retrouver les connexions */ public void testLecture() { assertNotNull(g_); internTestGrid(g_); File f = getFile("trigrid.geo"); EfGrid g2 = ((EfGridSource) SerafinFileFormat .getInstance() .getLastVersionImpl() .readGrid(f, null) .getSource()).getGrid(); assertNotNull(g2); assertTrue(g2.isEquivalent(g_, false, 1e-3d)); g_.computeBord(null); g2.computeBord(null); g_.getFrontiers().isSame(g2.getFrontiers().getArray()); internTestConnectionFound(g_); } private void internTestConnectionFound(EfGrid _g) { DodicoAnalyze a = new DodicoAnalyze(); int[][] r = EfLib.getConnexionFor(_g, null, a); assertTrue(a.isEmpty()); assertEquals(_g.getPtsNb(), r.length); //test de la ligne suivante // 1 6813.839 7844.116 1 1.078 1534 3684 1547 0 0 0 0 0 int[] rToTest = r[0]; assertEquals(3, rToTest.length); assertTrue(DodicoLib.findInt(rToTest, 1533) >= 0); assertTrue(DodicoLib.findInt(rToTest, 3683) >= 0); assertTrue(DodicoLib.findInt(rToTest, 1546) >= 0); // 3214 6567.800 6187.305 0 1.245 3084 2247 2443 3102 2990 2432 0 0 rToTest = r[3213]; assertEquals(6, rToTest.length); assertTrue(DodicoLib.findInt(rToTest, 3083) >= 0); assertTrue(DodicoLib.findInt(rToTest, 2246) >= 0); assertTrue(DodicoLib.findInt(rToTest, 2442) >= 0); assertTrue(DodicoLib.findInt(rToTest, 3101) >= 0); assertTrue(DodicoLib.findInt(rToTest, 2989) >= 0); assertTrue(DodicoLib.findInt(rToTest, 2431) >= 0); } private void internTestGrid(EfGrid _g) { assertEquals(3724, _g.getPtsNb()); //Attention les index sont decales EfNode p = _g.getPt(0); assertDoubleEquals(6813.839, p.getX()); assertDoubleEquals(7844.116, p.getY()); assertDoubleEquals(1.078, p.getZ()); p = _g.getPt(1790); assertDoubleEquals(5104.207, p.getX()); assertDoubleEquals(5580.120, p.getY()); assertDoubleEquals(-0.372, p.getZ()); //le dernier point p = _g.getPt(3723); assertDoubleEquals(4987.752, p.getX()); assertDoubleEquals(5484.865, p.getY()); assertDoubleEquals(-0.182, p.getZ()); assertEquals(5788, _g.getEltNb()); EfElement el = _g.getElement(0); assertTrue(el.containsIndex(0)); assertTrue(el.containsIndex(1533)); assertTrue(el.containsIndex(3683)); el = _g.getElement(44); assertTrue(el.containsIndex(23)); assertTrue(el.containsIndex(1718)); assertTrue(el.containsIndex(1592)); el = _g.getElement(132); assertTrue(el.containsIndex(64)); assertTrue(el.containsIndex(904)); assertTrue(el.containsIndex(1941)); el = _g.getElement(5787); assertTrue(el.containsIndex(3633)); assertTrue(el.containsIndex(3681)); assertTrue(el.containsIndex(3625)); } private void internTestGridWriter(EfGrid _g) { assertEquals(3724, _g.getPtsNb()); //Attention les index sont decales EfNode p = _g.getPt(0); assertDoubleEquals(6813.839, p.getX()); assertDoubleEquals(7844.116, p.getY()); assertDoubleEquals(1.078, p.getZ()); p = _g.getPt(1790); assertDoubleEquals(5104.207, p.getX()); assertDoubleEquals(5580.120, p.getY()); assertDoubleEquals(-0.372, p.getZ()); //le dernier point p = _g.getPt(3723); assertDoubleEquals(4987.752, p.getX()); assertDoubleEquals(5484.865, p.getY()); assertDoubleEquals(-0.182, p.getZ()); assertEquals(5788, _g.getEltNb()); EfElement el = new EfElement(new int[] { 0, 1533, 3683}); assertTrue(_g.isEltPresentInGrid(el)); el = new EfElement(new int[] { 23, 1718, 1592}); assertTrue(_g.isEltPresentInGrid(el)); el = new EfElement(new int[] { 64, 904, 1941}); assertTrue(_g.isEltPresentInGrid(el)); el = new EfElement(new int[] { 3633, 3681, 3625}); assertTrue(_g.isEltPresentInGrid(el)); } } --- TestCL.java DELETED --- --- TestClMng.java DELETED --- --- TestTrigrid.java DELETED --- --- TestCas.java DELETED --- --- TestSinusx.java DELETED --- --- TestSerafin.java DELETED --- --- TestLiquide.java DELETED --- |
|
From: <jm_...@us...> - 2004-03-05 15:17:36
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16567/dodico/src/org/fudaa/dodico/hydraulique1d Modified Files: DResultatsGeneraux.java DResultatsTemporelSpatial.java Log Message: Index: DResultatsGeneraux.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DResultatsGeneraux.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DResultatsGeneraux.java 2 Dec 2003 19:54:40 -0000 1.6 --- DResultatsGeneraux.java 5 Mar 2004 15:03:24 -0000 1.7 *************** *** 1,223 **** ! /* ! * @file DResultatsGeneraux.java ! * @creation 2000-08-10 ! * @modification $Date$ ! * @license GNU General Public License 2 ! * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne ! * @mail de...@fu... ! */ ! package org.fudaa.dodico.hydraulique1d; ! import java.util.Arrays; ! import org.fudaa.dodico.corba.hydraulique1d.IParametresReprise; ! import org.fudaa.dodico.corba.hydraulique1d.IResultatsGeneraux; ! import org.fudaa.dodico.corba.hydraulique1d.IResultatsGenerauxOperations; ! import org.fudaa.dodico.corba.hydraulique1d.IResultatsTemporelSpatial; ! import org.fudaa.dodico.corba.objet.IObjet; ! import org.fudaa.dodico.objet.CDodico; ! /** ! * @version $Revision$ $Date$ by $Author$ ! * @author Axel von Arnim ! */ ! public class DResultatsGeneraux ! extends DHydraulique1d ! implements IResultatsGenerauxOperations { ! public void initialise(IObjet _o) { ! super.initialise(_o); ! if (_o instanceof IResultatsGeneraux) { ! IResultatsGeneraux q= (IResultatsGeneraux)_o; ! listing(q.listing()); ! resultatReprise(q.resultatReprise()); ! listingDamocles(q.listingDamocles()); ! listingCasier(q.listingCasier()); ! listingLiaison(q.listingLiaison()); ! messagesEcran(q.messagesEcran()); ! resultatsRubens(q.resultatsRubens()); ! resultatsRubensCasier(q.resultatsRubensCasier()); ! resultatsRubensLiaison(q.resultatsRubensLiaison()); ! resultatsTemporelSpatial(q.resultatsTemporelSpatial()); ! resultatsTemporelCasier(q.resultatsTemporelCasier()); ! resultatsTemporelLiaison(q.resultatsTemporelLiaison()); ! } ! } ! final public IObjet creeClone() { ! IResultatsGeneraux p= ! CDodico.findUsine().creeHydraulique1dResultatsGeneraux(); ! p.initialise(tie()); ! return p; ! } ! final public String toString() { ! String s= "resultatsGeneraux"; ! return s; ! } ! /*** IResultatsGeneraux ***/ ! // constructeurs ! public DResultatsGeneraux() { ! super(); ! listing_= null; ! resultatReprise_= CDodico.findUsine().creeHydraulique1dParametresReprise(); ! messagesEcran_= null; ! listingDamocles_= null; ! listingCasier_= null; ! listingLiaison_= null; ! resultatsRubens_= null; ! resultatsRubensCasier_= null; ! resultatsRubensLiaison_= null; ! resultatsTemporelSpatial_= ! CDodico.findUsine().creeHydraulique1dResultatsTemporelSpatial(); ! resultatsTemporelCasier_= ! CDodico.findUsine().creeHydraulique1dResultatsTemporelSpatial(); ! resultatsTemporelLiaison_= ! CDodico.findUsine().creeHydraulique1dResultatsTemporelSpatial(); ! } ! public void dispose() { ! listing_= null; ! listingCasier_= null; ! listingLiaison_= null; ! if (resultatReprise_ != null) { ! resultatReprise_.dispose(); ! resultatReprise_= null; ! } ! messagesEcran_= null; ! listingDamocles_= null; ! if (resultatsTemporelSpatial_ != null) { ! resultatsTemporelSpatial_.dispose(); ! resultatsTemporelSpatial_= null; ! } ! if (resultatsTemporelCasier_ != null) { ! resultatsTemporelCasier_.dispose(); ! resultatsTemporelCasier_= null; ! } ! if (resultatsTemporelLiaison_ != null) { ! resultatsTemporelLiaison_.dispose(); ! resultatsTemporelLiaison_= null; ! } ! resultatsRubens_= null; ! resultatsRubensCasier_= null; ! resultatsRubensLiaison_= null; ! super.dispose(); ! } ! // Attributs ! private byte[] listingCasier_; ! public byte[] listingCasier() { ! return listingCasier_; ! } ! public void listingCasier(byte[] s) { ! if (Arrays.equals(listingCasier_, s)) return; ! listingCasier_= s; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "listingCasier"); ! } ! private byte[] listingLiaison_; ! public byte[] listingLiaison() { ! return listingLiaison_; ! } ! public void listingLiaison(byte[] s) { ! if (Arrays.equals(listingLiaison_, s)) return; ! listingLiaison_= s; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "listingLiaison"); ! } ! private byte[] listing_; ! public byte[] listing() { ! return listing_; ! } ! public void listing(byte[] s) { ! if (Arrays.equals(listing_, s)) return; ! listing_= s; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "listing"); ! } ! private IParametresReprise resultatReprise_; ! public IParametresReprise resultatReprise() { ! return resultatReprise_; ! } ! public void resultatReprise(IParametresReprise resultatReprise) { ! if (resultatReprise_==resultatReprise) return; ! resultatReprise_= resultatReprise; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "resultatReprise"); ! } ! private byte[] listingDamocles_; ! public byte[] listingDamocles() { ! return listingDamocles_; ! } ! public void listingDamocles(byte[] s) { ! if (Arrays.equals(listingDamocles_, s)) return; ! listingDamocles_= s; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "listingDamocles"); ! } ! private byte[] messagesEcran_; ! public byte[] messagesEcran() { ! return messagesEcran_; ! } ! public void messagesEcran(byte[] s) { ! if (Arrays.equals(messagesEcran_, s)) return; ! messagesEcran_= s; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "messagesEcran"); ! } ! private byte[] resultatsRubens_; ! public byte[] resultatsRubens() { ! return resultatsRubens_; ! } ! public void resultatsRubens(byte[] s) { ! if (Arrays.equals(resultatsRubens_, s)) return; ! resultatsRubens_= s; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "resultatsRubens"); ! } ! private byte[] resultatsRubensCasier_; ! public byte[] resultatsRubensCasier() { ! return resultatsRubensCasier_; ! } ! public void resultatsRubensCasier(byte[] s) { ! if (Arrays.equals(resultatsRubensCasier_, s)) return; ! resultatsRubensCasier_= s; ! CDodico.findUsine().fireObjetModifie( ! toString(), ! tie(), ! "resultatsRubensCasier"); ! } ! private byte[] resultatsRubensLiaison_; ! public byte[] resultatsRubensLiaison() { ! return resultatsRubensLiaison_; ! } ! public void resultatsRubensLiaison(byte[] s) { ! if (Arrays.equals(resultatsRubensLiaison_, s)) return; ! resultatsRubensLiaison_= s; ! CDodico.findUsine().fireObjetModifie( ! toString(), ! tie(), ! "resultatsRubensLiaison"); ! } ! private IResultatsTemporelSpatial resultatsTemporelSpatial_; ! public IResultatsTemporelSpatial resultatsTemporelSpatial() { ! return resultatsTemporelSpatial_; ! } ! public void resultatsTemporelSpatial(IResultatsTemporelSpatial r) { ! if (resultatsTemporelSpatial_==r) return; ! resultatsTemporelSpatial_= r; ! CDodico.findUsine().fireObjetModifie( ! toString(), ! tie(), ! "resultatsTemporelSpatial"); ! } ! private IResultatsTemporelSpatial resultatsTemporelCasier_; ! public IResultatsTemporelSpatial resultatsTemporelCasier() { ! return resultatsTemporelCasier_; ! } ! public void resultatsTemporelCasier(IResultatsTemporelSpatial r) { ! if (resultatsTemporelCasier_==r) return; ! resultatsTemporelCasier_= r; ! CDodico.findUsine().fireObjetModifie( ! toString(), ! tie(), ! "resultatsTemporelCasier"); ! } ! private IResultatsTemporelSpatial resultatsTemporelLiaison_; ! public IResultatsTemporelSpatial resultatsTemporelLiaison() { ! return resultatsTemporelLiaison_; ! } ! public void resultatsTemporelLiaison(IResultatsTemporelSpatial r) { ! if (resultatsTemporelLiaison_==r) return; ! resultatsTemporelLiaison_= r; ! CDodico.findUsine().fireObjetModifie( ! toString(), ! tie(), ! "resultatsTemporelLiaison"); ! } ! } --- 1,225 ---- ! /* ! * @file DResultatsGeneraux.java ! * @creation 2000-08-10 ! * @modification $Date$ ! * @license GNU General Public License 2 ! * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne ! * @mail de...@fu... ! */ ! package org.fudaa.dodico.hydraulique1d; ! import java.util.Arrays; ! import org.fudaa.dodico.corba.hydraulique1d.IParametresReprise; ! import org.fudaa.dodico.corba.hydraulique1d.IResultatsGeneraux; ! import org.fudaa.dodico.corba.hydraulique1d.IResultatsGenerauxOperations; ! import org.fudaa.dodico.corba.hydraulique1d.IResultatsTemporelSpatial; ! import org.fudaa.dodico.corba.objet.IObjet; ! import org.fudaa.dodico.objet.CDodico; ! /** ! * @version $Revision$ $Date$ by $Author$ ! * @author Axel von Arnim ! */ ! public class DResultatsGeneraux ! extends DHydraulique1d ! implements IResultatsGenerauxOperations { ! public void initialise(IObjet _o) { ! super.initialise(_o); ! if (_o instanceof IResultatsGeneraux) { ! IResultatsGeneraux q= (IResultatsGeneraux)_o; ! listing(q.listing()); ! resultatReprise(q.resultatReprise()); ! listingDamocles(q.listingDamocles()); ! listingCasier(q.listingCasier()); ! listingLiaison(q.listingLiaison()); ! messagesEcran(q.messagesEcran()); ! resultatsRubens(q.resultatsRubens()); ! resultatsRubensCasier(q.resultatsRubensCasier()); ! resultatsRubensLiaison(q.resultatsRubensLiaison()); ! resultatsTemporelSpatial(q.resultatsTemporelSpatial()); ! resultatsTemporelCasier(q.resultatsTemporelCasier()); ! resultatsTemporelLiaison(q.resultatsTemporelLiaison()); ! } ! } ! final public IObjet creeClone() { ! IResultatsGeneraux p= ! CDodico.findUsine().creeHydraulique1dResultatsGeneraux(); ! p.initialise(tie()); ! return p; ! } ! final public String toString() { ! String s= "resultatsGeneraux"; ! return s; ! } ! /*** IResultatsGeneraux ***/ ! // constructeurs ! public DResultatsGeneraux() { ! super(); ! listing_= null; ! resultatReprise_= CDodico.findUsine().creeHydraulique1dParametresReprise(); ! messagesEcran_= null; ! listingDamocles_= null; ! listingCasier_= null; ! listingLiaison_= null; ! resultatsRubens_= null; ! resultatsRubensCasier_= null; ! resultatsRubensLiaison_= null; ! resultatsTemporelSpatial_= ! CDodico.findUsine().creeHydraulique1dResultatsTemporelSpatial(); ! resultatsTemporelCasier_= ! CDodico.findUsine().creeHydraulique1dResultatsTemporelSpatial(); ! resultatsTemporelLiaison_= ! CDodico.findUsine().creeHydraulique1dResultatsTemporelSpatial(); ! } ! public void dispose() { ! listing_= null; ! listingCasier_= null; ! listingLiaison_= null; ! if (resultatReprise_ != null) { ! resultatReprise_.dispose(); ! resultatReprise_= null; ! } ! messagesEcran_= null; ! listingDamocles_= null; ! if (resultatsTemporelSpatial_ != null) { ! resultatsTemporelSpatial_.dispose(); ! resultatsTemporelSpatial_= null; ! } ! if (resultatsTemporelCasier_ != null) { ! resultatsTemporelCasier_.dispose(); ! resultatsTemporelCasier_= null; ! } ! if (resultatsTemporelLiaison_ != null) { ! resultatsTemporelLiaison_.dispose(); ! resultatsTemporelLiaison_= null; ! } ! resultatsRubens_= null; ! resultatsRubensCasier_= null; ! resultatsRubensLiaison_= null; ! super.dispose(); ! } ! // Attributs ! private byte[] listingCasier_; ! public byte[] listingCasier() { ! return listingCasier_; ! } ! public void listingCasier(byte[] s) { ! if (Arrays.equals(listingCasier_, s)) return; ! listingCasier_= s; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "listingCasier"); ! } ! private byte[] listingLiaison_; ! public byte[] listingLiaison() { ! return listingLiaison_; ! } ! public void listingLiaison(byte[] s) { ! if (Arrays.equals(listingLiaison_, s)) return; ! listingLiaison_= s; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "listingLiaison"); ! } ! private byte[] listing_; ! public byte[] listing() { ! return listing_; ! } ! public void listing(byte[] s) { ! if (Arrays.equals(listing_, s)) return; ! listing_= s; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "listing"); ! } ! private IParametresReprise resultatReprise_; ! public IParametresReprise resultatReprise() { ! return resultatReprise_; ! } ! public void resultatReprise(IParametresReprise resultatReprise) { ! if (resultatReprise_==resultatReprise) return; ! resultatReprise_= resultatReprise; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "resultatReprise"); ! } ! private byte[] listingDamocles_; ! public byte[] listingDamocles() { ! return listingDamocles_; ! } ! public void listingDamocles(byte[] s) { ! if (Arrays.equals(listingDamocles_, s)) return; ! listingDamocles_= s; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "listingDamocles"); ! } ! private byte[] messagesEcran_; ! public byte[] messagesEcran() { ! return messagesEcran_; ! } ! public void messagesEcran(byte[] s) { ! if (Arrays.equals(messagesEcran_, s)) return; ! messagesEcran_= s; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "messagesEcran"); ! } ! private byte[] resultatsRubens_; ! public byte[] resultatsRubens() { ! return resultatsRubens_; ! } ! public void resultatsRubens(byte[] s) { ! if (Arrays.equals(resultatsRubens_, s)) return; ! resultatsRubens_= s; ! CDodico.findUsine().fireObjetModifie(toString(), tie(), "resultatsRubens"); ! } ! private byte[] resultatsRubensCasier_; ! public byte[] resultatsRubensCasier() { ! return resultatsRubensCasier_; ! } ! public void resultatsRubensCasier(byte[] s) { ! if (Arrays.equals(resultatsRubensCasier_, s)) return; ! resultatsRubensCasier_= s; ! CDodico.findUsine().fireObjetModifie( ! toString(), ! tie(), ! "resultatsRubensCasier"); ! } ! private byte[] resultatsRubensLiaison_; ! public byte[] resultatsRubensLiaison() { ! return resultatsRubensLiaison_; ! } ! public void resultatsRubensLiaison(byte[] s) { ! if (Arrays.equals(resultatsRubensLiaison_, s)) return; ! resultatsRubensLiaison_= s; ! CDodico.findUsine().fireObjetModifie( ! toString(), ! tie(), ! "resultatsRubensLiaison"); ! } ! private IResultatsTemporelSpatial resultatsTemporelSpatial_; ! public IResultatsTemporelSpatial resultatsTemporelSpatial() { ! return resultatsTemporelSpatial_; ! } ! public void resultatsTemporelSpatial(IResultatsTemporelSpatial r) { ! if (resultatsTemporelSpatial_==r) return; ! resultatsTemporelSpatial_= r; ! CDodico.findUsine().fireObjetModifie( ! toString(), ! tie(), ! "resultatsTemporelSpatial"); ! } ! private IResultatsTemporelSpatial resultatsTemporelCasier_; ! public IResultatsTemporelSpatial resultatsTemporelCasier() { ! resultatsTemporelCasier_.resultatsCasier(true); ! return resultatsTemporelCasier_; ! } ! public void resultatsTemporelCasier(IResultatsTemporelSpatial r) { ! if (resultatsTemporelCasier_==r) return; ! resultatsTemporelCasier_= r; ! CDodico.findUsine().fireObjetModifie( ! toString(), ! tie(), ! "resultatsTemporelCasier"); ! } ! private IResultatsTemporelSpatial resultatsTemporelLiaison_; ! public IResultatsTemporelSpatial resultatsTemporelLiaison() { ! resultatsTemporelLiaison_.resultatsLiaison(true); ! return resultatsTemporelLiaison_; ! } ! public void resultatsTemporelLiaison(IResultatsTemporelSpatial r) { ! if (resultatsTemporelLiaison_==r) return; ! resultatsTemporelLiaison_= r; ! CDodico.findUsine().fireObjetModifie( ! toString(), ! tie(), ! "resultatsTemporelLiaison"); ! } ! } Index: DResultatsTemporelSpatial.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DResultatsTemporelSpatial.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DResultatsTemporelSpatial.java 5 Mar 2004 13:08:47 -0000 1.5 --- DResultatsTemporelSpatial.java 5 Mar 2004 15:03:24 -0000 1.6 *************** *** 44,47 **** --- 44,50 ---- descriptionVariables(ip); } + resultatsCasier(q.resultatsCasier()); + resultatsLiaison(q.resultatsLiaison()); + resultatsPermanent(q.resultatsPermanent()); } } *************** *** 63,66 **** --- 66,72 ---- resultatsBiefs_= new IResultatsTemporelSpatialBief[0]; descriptionVariables_= new IDescriptionVariable[0]; + resultatsCasier_ = false; + resultatsLiaison_ = false; + resultatsPermanent_ = false; } public void dispose() { *************** *** 131,133 **** --- 137,148 ---- } + private boolean resultatsPermanent_; + public boolean resultatsPermanent() { + return resultatsPermanent_; + } + public void resultatsPermanent(boolean resultatsPermanent) { + if (resultatsPermanent_ == resultatsPermanent) return; + resultatsPermanent_ = resultatsPermanent; + CDodico.findUsine().fireObjetModifie(toString(), tie(), "resultatsPermanent"); + } } |
|
From: <jm_...@us...> - 2004-03-05 15:17:36
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/idl/metier In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16567/dodico/idl/metier Modified Files: hydraulique1d.idl Log Message: Index: hydraulique1d.idl =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/idl/metier/hydraulique1d.idl,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** hydraulique1d.idl 5 Mar 2004 13:01:35 -0000 1.12 --- hydraulique1d.idl 5 Mar 2004 15:03:24 -0000 1.13 *************** *** 1,1313 **** ! /* ! * @file hydraulique1d.idl ! * @creation 2000-05-17 ! * @modification $Date$ ! * @license GNU General Public License 2 ! * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne ! * @mail de...@fu... ! */ ! ! #ifndef _HYDRAULIQUE1D_IDL [...2598 lines suppressed...] ! booleen isPlanimetrage(); ! rien toPlanimetrage(); ! }; ! ! //************************************************************************/ ! //* FIN DONNEES CASIER */ ! //************************************************************************/ ! ! //************************************************************************/ ! //* CALCUL */ ! //************************************************************************/ ! ! interface ICalculHydraulique1d : iservice //::calcul::ICalculMetier ! { ! attribute calcul::ICalcul calculCode; ! attribute IEtude1d etude; ! }; ! }; ! ! #endif |
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16567/dodico/src/org/fudaa/dodico/mascaret Modified Files: ConvH1D_Masc.java ConvMasc_H1D.java DResultatsMascaret.java Rubens1DNonPermReader.java Rubens1DPermReader.java Log Message: Index: ConvH1D_Masc.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/ConvH1D_Masc.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ConvH1D_Masc.java 5 Mar 2004 13:06:09 -0000 1.1 --- ConvH1D_Masc.java 5 Mar 2004 15:03:25 -0000 1.2 *************** *** 1,1526 **** ! /* ! * @file ConvH1D_Masc.java ! * @creation 2004-03-01 ! * @modification $Date$ ! * @license GNU General Public License 2 ! * @copyright (c)1998-2004 EDF/LNHE ! * @mail de...@fu... ! */ ! package org.fudaa.dodico.mascaret; ! import java.util.Arrays; [...3024 lines suppressed...] ! return null; ! if (res.resultatsBiefs().length == 0) ! return null; ! if (res.resultatsBiefs()[0].abscissesSections() == null) ! return null; ! if (res.resultatsBiefs()[0].abscissesSections().length == 0) ! return null; ! if (res.resultatsBiefs()[0].valeursVariables() == null) ! return null; ! if (res.resultatsBiefs()[0].valeursVariables().length == 0) ! return null; ! SResultatsVariable[] vars= ! convertirDescriptionsVariables2ResultatsVariable( ! res.descriptionVariables()); ! SResultatPasTemps[] resPasTps= ! convertirResultatsTemporelSpatial2ResultatsPasTemps(res); ! SResultatsOPT r= new SResultatsOPT(vars, resPasTps); ! return r; ! } ! } Index: ConvMasc_H1D.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/ConvMasc_H1D.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ConvMasc_H1D.java 5 Mar 2004 13:06:09 -0000 1.1 --- ConvMasc_H1D.java 5 Mar 2004 15:03:25 -0000 1.2 *************** *** 1,201 **** ! /* ! * @file ConvMasc_H1D.java ! * @creation 2004-03-01 ! * @modification $Date$ ! * @license GNU General Public License 2 ! * @copyright (c)1998-2004 EDF/LNHE ! * @mail de...@fu... ! */ ! package org.fudaa.dodico.mascaret; ! import java.util.StringTokenizer; ! import java.util.Vector; ! import org.fudaa.dodico.corba.hydraulique1d.IDescriptionVariable; ! import org.fudaa.dodico.corba.hydraulique1d.ILigneEauPoint; ! import org.fudaa.dodico.corba.hydraulique1d.IParametresReprise; ! import org.fudaa.dodico.corba.hydraulique1d.IResultatsTemporelSpatial; ! import org.fudaa.dodico.corba.hydraulique1d.IResultatsTemporelSpatialBief; ! import org.fudaa.dodico.corba.mascaret.SParametresREP; ! import org.fudaa.dodico.corba.mascaret.SResultatBief; ! import org.fudaa.dodico.corba.mascaret.SResultatPasTemps; ! import org.fudaa.dodico.corba.mascaret.SResultatSection; ! import org.fudaa.dodico.corba.mascaret.SResultatsOPT; ! import org.fudaa.dodico.corba.mascaret.SResultatsTemporelSpatial; ! import org.fudaa.dodico.corba.mascaret.SResultatsTemporelSpatialBief; ! import org.fudaa.dodico.corba.mascaret.SResultatsVariable; ! import org.fudaa.dodico.objet.CDodico; ! /** ! * Méthodes statiques pour convertir le modèle mascaret (les résultats ! * du code) en modèle métier hydraulique1d ! * ! * @version $Revision$ $Date$ by $Author$ ! * @author Jean-Marc Lacombe ! */ ! public class ConvMasc_H1D { ! ! final static IResultatsTemporelSpatial RES_OPTHYCA_VIDE= ! convertirResultatsOpt2ResultatsTemporelSpatial( ! new SResultatsOPT(new SResultatsVariable[0], new SResultatPasTemps[0])); ! final static IParametresReprise RES_REP_VIDE= ! convertirResultatsRep(new SParametresREP(new byte[0])); ! ! public static IParametresReprise convertirResultatsRep(SParametresREP param) { // conversion Fichier de reprise en écriture ! IParametresReprise repHydr= ! CDodico.findUsine().creeHydraulique1dParametresReprise(); ! if (param.contenu.length == 0) ! return repHydr; ! repHydr.fichier(""); ! String chaine= new String(param.contenu); ! int index= chaine.indexOf("FIN"); // le temps final se trouve aprés FIN ! String chaineSansLigneInitiale= chaine.substring(index + 3); ! StringTokenizer st= new StringTokenizer(chaineSansLigneInitiale); ! repHydr.tFinal(Double.parseDouble(st.nextToken())); ! repHydr.contenu(chaine.getBytes()); ! return repHydr; ! } ! public static IDescriptionVariable[] convertirResultatsVariables2DescriptionVariable(SResultatsVariable[] descVars) { ! return DescriptionVariables.conversion(descVars); ! } ! ! public static double[] convertirResultatsPasTemps(SResultatPasTemps[] sres) { ! double res[]= new double[sres.length]; ! for (int i= 0; i < res.length; i++) { ! res[i]= sres[i].t; ! } ! return res; ! } ! public static IResultatsTemporelSpatialBief[] convertirResultatsPasTemps2ResultatsTemporelSpatialBief( ! SResultatPasTemps[] sres, ! int nbVar) { ! if (sres.length == 0) ! return new IResultatsTemporelSpatialBief[0]; ! if (nbVar == 0) ! return new IResultatsTemporelSpatialBief[0]; ! int nbPasTps= sres.length; ! int nbBief= sres[0].resultatsBief.length; ! //il y a le même nombre de bief à tous la pas de temps ! IResultatsTemporelSpatialBief[] res= ! new IResultatsTemporelSpatialBief[nbBief]; ! for (int i= 0; i < res.length; i++) { ! res[i]= ! CDodico.findUsine().creeHydraulique1dResultatsTemporelSpatialBief(); ! SResultatSection[] sectionsBief= ! sres[0].resultatsBief[i].resultatsSection; ! double[] absc= new double[sectionsBief.length]; ! double[][][] valeurs= new double[nbVar][nbPasTps][absc.length]; ! for (int j= 0; j < absc.length; j++) { ! absc[j]= sectionsBief[j].absc; ! } ! res[i].abscissesSections(absc); ! res[i].valeursVariables(valeurs); ! } ! for (int i= 0; i < sres.length; i++) { //nb de Pas Temps ! SResultatPasTemps resPasTps= sres[i]; ! for (int j= 0; j < resPasTps.resultatsBief.length; j++) { //nb de Bief ! SResultatBief resBief= resPasTps.resultatsBief[j]; ! for (int k= 0; ! k < resBief.resultatsSection.length; ! k++) { //nb de section ! SResultatSection resSec= resBief.resultatsSection[k]; ! for (int l= 0; l < resSec.valeurs.length; l++) { //nb de variable ! double[][][] vals= res[j].valeursVariables(); ! vals[l][i][k]= resSec.valeurs[l]; ! } ! } ! } ! } ! return res; ! } ! public static IResultatsTemporelSpatial convertirResultatsOpt2ResultatsTemporelSpatial(SResultatsOPT opt) { ! IResultatsTemporelSpatial res= ! CDodico.findUsine().creeHydraulique1dResultatsTemporelSpatial(); ! res.descriptionVariables(DescriptionVariables.conversion(opt.variables)); ! res.pasTemps(convertirResultatsPasTemps(opt.resultatsPasTemps)); ! res.resultatsBiefs( ! convertirResultatsPasTemps2ResultatsTemporelSpatialBief( ! opt.resultatsPasTemps, ! res.descriptionVariables().length)); ! return res; ! } ! public static IResultatsTemporelSpatial convertirResultatsTemporelSpatialMasToH1d(SResultatsTemporelSpatial sres) { ! IResultatsTemporelSpatial ires= CDodico.findUsine().creeHydraulique1dResultatsTemporelSpatial(); ! ires.resultatsCasier(sres.resultatsCasier); ! ires.resultatsLiaison(sres.resultatsLiaison); ! ires.descriptionVariables(DescriptionVariables.conversion(sres.variables)); ! ires.pasTemps(sres.pasTemps); ! int nbBiefRes = sres.resultatsBiefs.length; ! IResultatsTemporelSpatialBief[] iresBiefs = new IResultatsTemporelSpatialBief[nbBiefRes]; ! ires.resultatsBiefs(iresBiefs); ! for (int i = 0; i < nbBiefRes; i++) { ! iresBiefs[i] = CDodico.findUsine().creeHydraulique1dResultatsTemporelSpatialBief(); ! SResultatsTemporelSpatialBief sresBief = sres.resultatsBiefs[i]; ! iresBiefs[i].abscissesSections(sresBief.abscissesSections); ! iresBiefs[i].valeursVariables(sresBief.valeursVariables); ! } ! return ires; ! } ! public static ILigneEauPoint[] convertirResultatsTemporelSpatial2LigneEauPoint(SResultatsTemporelSpatial param) { // conversion Fichier de reprise en écriture ! Vector newLigneEau= new Vector(); ! int indexeCote= rechercheIndexe("Z", param.variables); ! int indexeDebitMin= rechercheIndexe("QMIN", param.variables); ! int indexeDebitMaj= rechercheIndexe("QMAJ", param.variables); ! int indexeFrotMin= rechercheIndexe("S1", param.variables); ! int indexeFrotMaj= rechercheIndexe("S2", param.variables); ! ! int indexDernierPasTps= param.pasTemps.length - 1; ! if (indexDernierPasTps == -1) return new ILigneEauPoint[0]; ! ! int nbBief = param.resultatsBiefs.length; ! if (nbBief <1) return new ILigneEauPoint[0]; ! int nbSection = 0; ! for (int i = 0; i < nbBief; i++) { ! nbSection += param.resultatsBiefs[i].abscissesSections.length; ! } ! ILigneEauPoint[] res = new ILigneEauPoint[nbSection]; ! int indexLigneEau =0; ! for (int i = 0; i < nbBief; i++) { ! SResultatsTemporelSpatialBief resBiefi = param.resultatsBiefs[i]; ! double[] vAbsc = resBiefi.abscissesSections; ! double[] vCote = null; ! if (indexeCote != -1) ! vCote = resBiefi.valeursVariables[indexeCote][indexDernierPasTps]; ! double[] vDebitMin = null; ! if (indexeDebitMin != -1) ! vDebitMin = resBiefi.valeursVariables[indexeDebitMin][indexDernierPasTps]; ! double[] vDebitMaj = null; ! if (indexeDebitMaj != -1) ! vDebitMaj = resBiefi.valeursVariables[indexeDebitMaj][indexDernierPasTps]; ! double[] vFrotMin = null; ! if (indexeFrotMin != -1) ! vFrotMin = resBiefi.valeursVariables[indexeFrotMin][indexDernierPasTps]; ! double[] vFrotMaj = null; ! if (indexeFrotMaj != -1) ! vFrotMaj = resBiefi.valeursVariables[indexeFrotMaj][indexDernierPasTps]; ! for (int j = 0; j < vCote.length; j++) { ! res[indexLigneEau] = CDodico.findUsine().creeHydraulique1dLigneEauPoint(); ! res[indexLigneEau].numeroBief(i+1); ! if (vAbsc != null) ! res[indexLigneEau].abscisse(vAbsc[j]); ! if (vCote != null) ! res[indexLigneEau].cote(vCote[j]); ! if ((vDebitMin != null) && (vDebitMin != null)) ! res[indexLigneEau].debit(vDebitMin[j]+vDebitMaj[j]); ! if (vFrotMin != null) ! res[indexLigneEau].coefFrottementMin(vFrotMin[j]); ! if (vFrotMaj != null) ! res[indexLigneEau].coefFrottementMaj(vFrotMaj[j]); ! indexLigneEau++; ! } ! } ! return res; ! } ! private static int rechercheIndexe( ! String nomCourt, ! SResultatsVariable[] variables) { ! int indexe= -1; ! for (indexe= 0; indexe < variables.length; indexe++) { ! if (nomCourt.equals(variables[indexe].nomCourt)) ! return indexe; ! } ! return -1; ! } ! } --- 1,202 ---- ! /* ! * @file ConvMasc_H1D.java ! * @creation 2004-03-01 ! * @modification $Date$ ! * @license GNU General Public License 2 ! * @copyright (c)1998-2004 EDF/LNHE ! * @mail de...@fu... ! */ ! package org.fudaa.dodico.mascaret; ! import java.util.StringTokenizer; ! import java.util.Vector; ! import org.fudaa.dodico.corba.hydraulique1d.IDescriptionVariable; ! import org.fudaa.dodico.corba.hydraulique1d.ILigneEauPoint; ! import org.fudaa.dodico.corba.hydraulique1d.IParametresReprise; ! import org.fudaa.dodico.corba.hydraulique1d.IResultatsTemporelSpatial; ! import org.fudaa.dodico.corba.hydraulique1d.IResultatsTemporelSpatialBief; ! import org.fudaa.dodico.corba.mascaret.SParametresREP; ! import org.fudaa.dodico.corba.mascaret.SResultatBief; ! import org.fudaa.dodico.corba.mascaret.SResultatPasTemps; ! import org.fudaa.dodico.corba.mascaret.SResultatSection; ! import org.fudaa.dodico.corba.mascaret.SResultatsOPT; ! import org.fudaa.dodico.corba.mascaret.SResultatsTemporelSpatial; ! import org.fudaa.dodico.corba.mascaret.SResultatsTemporelSpatialBief; ! import org.fudaa.dodico.corba.mascaret.SResultatsVariable; ! import org.fudaa.dodico.objet.CDodico; ! /** ! * Méthodes statiques pour convertir le modèle mascaret (les résultats ! * du code) en modèle métier hydraulique1d ! * ! * @version $Revision$ $Date$ by $Author$ ! * @author Jean-Marc Lacombe ! */ ! public class ConvMasc_H1D { ! ! final static IResultatsTemporelSpatial RES_OPTHYCA_VIDE= ! convertirResultatsOpt2ResultatsTemporelSpatial( ! new SResultatsOPT(new SResultatsVariable[0], new SResultatPasTemps[0])); ! final static IParametresReprise RES_REP_VIDE= ! convertirResultatsRep(new SParametresREP(new byte[0])); ! ! public static IParametresReprise convertirResultatsRep(SParametresREP param) { // conversion Fichier de reprise en écriture ! IParametresReprise repHydr= ! CDodico.findUsine().creeHydraulique1dParametresReprise(); ! if (param.contenu.length == 0) ! return repHydr; ! repHydr.fichier(""); ! String chaine= new String(param.contenu); ! int index= chaine.indexOf("FIN"); // le temps final se trouve aprés FIN ! String chaineSansLigneInitiale= chaine.substring(index + 3); ! StringTokenizer st= new StringTokenizer(chaineSansLigneInitiale); ! repHydr.tFinal(Double.parseDouble(st.nextToken())); ! repHydr.contenu(chaine.getBytes()); ! return repHydr; ! } ! public static IDescriptionVariable[] convertirResultatsVariables2DescriptionVariable(SResultatsVariable[] descVars) { ! return DescriptionVariables.conversion(descVars); ! } ! ! public static double[] convertirResultatsPasTemps(SResultatPasTemps[] sres) { ! double res[]= new double[sres.length]; ! for (int i= 0; i < res.length; i++) { ! res[i]= sres[i].t; ! } ! return res; ! } ! public static IResultatsTemporelSpatialBief[] convertirResultatsPasTemps2ResultatsTemporelSpatialBief( ! SResultatPasTemps[] sres, ! int nbVar) { ! if (sres.length == 0) ! return new IResultatsTemporelSpatialBief[0]; ! if (nbVar == 0) ! return new IResultatsTemporelSpatialBief[0]; ! int nbPasTps= sres.length; ! int nbBief= sres[0].resultatsBief.length; ! //il y a le même nombre de bief à tous la pas de temps ! IResultatsTemporelSpatialBief[] res= ! new IResultatsTemporelSpatialBief[nbBief]; ! for (int i= 0; i < res.length; i++) { ! res[i]= ! CDodico.findUsine().creeHydraulique1dResultatsTemporelSpatialBief(); ! SResultatSection[] sectionsBief= ! sres[0].resultatsBief[i].resultatsSection; ! double[] absc= new double[sectionsBief.length]; ! double[][][] valeurs= new double[nbVar][nbPasTps][absc.length]; ! for (int j= 0; j < absc.length; j++) { ! absc[j]= sectionsBief[j].absc; ! } ! res[i].abscissesSections(absc); ! res[i].valeursVariables(valeurs); ! } ! for (int i= 0; i < sres.length; i++) { //nb de Pas Temps ! SResultatPasTemps resPasTps= sres[i]; ! for (int j= 0; j < resPasTps.resultatsBief.length; j++) { //nb de Bief ! SResultatBief resBief= resPasTps.resultatsBief[j]; ! for (int k= 0; ! k < resBief.resultatsSection.length; ! k++) { //nb de section ! SResultatSection resSec= resBief.resultatsSection[k]; ! for (int l= 0; l < resSec.valeurs.length; l++) { //nb de variable ! double[][][] vals= res[j].valeursVariables(); ! vals[l][i][k]= resSec.valeurs[l]; ! } ! } ! } ! } ! return res; ! } ! public static IResultatsTemporelSpatial convertirResultatsOpt2ResultatsTemporelSpatial(SResultatsOPT opt) { ! IResultatsTemporelSpatial res= ! CDodico.findUsine().creeHydraulique1dResultatsTemporelSpatial(); ! res.descriptionVariables(DescriptionVariables.conversion(opt.variables)); ! res.pasTemps(convertirResultatsPasTemps(opt.resultatsPasTemps)); ! res.resultatsBiefs( ! convertirResultatsPasTemps2ResultatsTemporelSpatialBief( ! opt.resultatsPasTemps, ! res.descriptionVariables().length)); ! return res; ! } ! public static IResultatsTemporelSpatial convertirResultatsTemporelSpatialMasToH1d(SResultatsTemporelSpatial sres) { ! IResultatsTemporelSpatial ires= CDodico.findUsine().creeHydraulique1dResultatsTemporelSpatial(); ! ires.resultatsCasier(sres.resultatsCasier); ! ires.resultatsLiaison(sres.resultatsLiaison); ! ires.resultatsPermanent(sres.resultatsPermanent); ! ires.descriptionVariables(DescriptionVariables.conversion(sres.variables)); ! ires.pasTemps(sres.pasTemps); ! int nbBiefRes = sres.resultatsBiefs.length; ! IResultatsTemporelSpatialBief[] iresBiefs = new IResultatsTemporelSpatialBief[nbBiefRes]; ! ires.resultatsBiefs(iresBiefs); ! for (int i = 0; i < nbBiefRes; i++) { ! iresBiefs[i] = CDodico.findUsine().creeHydraulique1dResultatsTemporelSpatialBief(); ! SResultatsTemporelSpatialBief sresBief = sres.resultatsBiefs[i]; ! iresBiefs[i].abscissesSections(sresBief.abscissesSections); ! iresBiefs[i].valeursVariables(sresBief.valeursVariables); ! } ! return ires; ! } ! public static ILigneEauPoint[] convertirResultatsTemporelSpatial2LigneEauPoint(SResultatsTemporelSpatial param) { // conversion Fichier de reprise en écriture ! Vector newLigneEau= new Vector(); ! int indexeCote= rechercheIndexe("Z", param.variables); ! int indexeDebitMin= rechercheIndexe("QMIN", param.variables); ! int indexeDebitMaj= rechercheIndexe("QMAJ", param.variables); ! int indexeFrotMin= rechercheIndexe("S1", param.variables); ! int indexeFrotMaj= rechercheIndexe("S2", param.variables); ! ! int indexDernierPasTps= param.pasTemps.length - 1; ! if (indexDernierPasTps == -1) return new ILigneEauPoint[0]; ! ! int nbBief = param.resultatsBiefs.length; ! if (nbBief <1) return new ILigneEauPoint[0]; ! int nbSection = 0; ! for (int i = 0; i < nbBief; i++) { ! nbSection += param.resultatsBiefs[i].abscissesSections.length; ! } ! ILigneEauPoint[] res = new ILigneEauPoint[nbSection]; ! int indexLigneEau =0; ! for (int i = 0; i < nbBief; i++) { ! SResultatsTemporelSpatialBief resBiefi = param.resultatsBiefs[i]; ! double[] vAbsc = resBiefi.abscissesSections; ! double[] vCote = null; ! if (indexeCote != -1) ! vCote = resBiefi.valeursVariables[indexeCote][indexDernierPasTps]; ! double[] vDebitMin = null; ! if (indexeDebitMin != -1) ! vDebitMin = resBiefi.valeursVariables[indexeDebitMin][indexDernierPasTps]; ! double[] vDebitMaj = null; ! if (indexeDebitMaj != -1) ! vDebitMaj = resBiefi.valeursVariables[indexeDebitMaj][indexDernierPasTps]; ! double[] vFrotMin = null; ! if (indexeFrotMin != -1) ! vFrotMin = resBiefi.valeursVariables[indexeFrotMin][indexDernierPasTps]; ! double[] vFrotMaj = null; ! if (indexeFrotMaj != -1) ! vFrotMaj = resBiefi.valeursVariables[indexeFrotMaj][indexDernierPasTps]; ! for (int j = 0; j < vCote.length; j++) { ! res[indexLigneEau] = CDodico.findUsine().creeHydraulique1dLigneEauPoint(); ! res[indexLigneEau].numeroBief(i+1); ! if (vAbsc != null) ! res[indexLigneEau].abscisse(vAbsc[j]); ! if (vCote != null) ! res[indexLigneEau].cote(vCote[j]); ! if ((vDebitMin != null) && (vDebitMin != null)) ! res[indexLigneEau].debit(vDebitMin[j]+vDebitMaj[j]); ! if (vFrotMin != null) ! res[indexLigneEau].coefFrottementMin(vFrotMin[j]); ! if (vFrotMaj != null) ! res[indexLigneEau].coefFrottementMaj(vFrotMaj[j]); ! indexLigneEau++; ! } ! } ! return res; ! } ! private static int rechercheIndexe( ! String nomCourt, ! SResultatsVariable[] variables) { ! int indexe= -1; ! for (indexe= 0; indexe < variables.length; indexe++) { ! if (nomCourt.equals(variables[indexe].nomCourt)) ! return indexe; ! } ! return -1; ! } ! } Index: DResultatsMascaret.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/DResultatsMascaret.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** DResultatsMascaret.java 5 Mar 2004 13:06:09 -0000 1.7 --- DResultatsMascaret.java 5 Mar 2004 15:03:25 -0000 1.8 *************** *** 1,533 **** ! /* ! * @file DResultatsMascaret.java ! * @creation 2000-05-10 ! * @modification $Date$ ! * @license GNU General Public License 2 ! * @copyright (c)1998-2001 EDF/LNHE ! * @mail de...@fu... ! */ ! package org.fudaa.dodico.mascaret; ! import java.io.BufferedReader; [...1041 lines suppressed...] ! } ! public void liaisonLIS(SResultatsLIS _listingLiaison) { ! listingLiaison_= _listingLiaison; ! } ! ! public static void main(String arg[]) { ! try { ! SResultatsTemporelSpatial res= ! litResultatsTemporelSpatial( ! new File("/win_d/lacombe/mascaret541_ecr.opt"), ! Double.MAX_VALUE,OPTYCA); ! for (int i= 0; i < res.variables.length; i++) { ! System.out.println( ! "res.variables[" + i + "].nomLong=" + res.variables[i].nomLong); ! } ! } catch (Exception ex) { ! ex.printStackTrace(); ! } ! } ! } Index: Rubens1DNonPermReader.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/Rubens1DNonPermReader.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Rubens1DNonPermReader.java 5 Mar 2004 13:06:09 -0000 1.1 --- Rubens1DNonPermReader.java 5 Mar 2004 15:03:25 -0000 1.2 *************** *** 114,117 **** --- 114,118 ---- println("nbSecParBief", nbSecParBief); SResultatsTemporelSpatial res = new SResultatsTemporelSpatial(); + res.resultatsPermanent = false; if (DescriptionVariables.isContientNomsLiaison(nomsVarDependanteTemps)) { res.resultatsLiaison = true; Index: Rubens1DPermReader.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/Rubens1DPermReader.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Rubens1DPermReader.java 5 Mar 2004 13:06:09 -0000 1.1 --- Rubens1DPermReader.java 5 Mar 2004 15:03:25 -0000 1.2 *************** *** 67,70 **** --- 67,71 ---- SResultatsTemporelSpatial res = new SResultatsTemporelSpatial(); + res.resultatsPermanent = true; int nbPasTemps = listResulatPasTemps.size(); if (nbPasTemps > 0) { |
|
From: <jm_...@us...> - 2004-03-05 15:17:35
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16567/fudaa/src/org/fudaa/fudaa/mascaret Modified Files: MascaretImplementation.java Log Message: Index: MascaretImplementation.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/MascaretImplementation.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** MascaretImplementation.java 5 Mar 2004 13:11:43 -0000 1.15 --- MascaretImplementation.java 5 Mar 2004 15:03:25 -0000 1.16 *************** *** 781,785 **** Hydraulique1dExport.exportRubens( new File(nom + ".rub"), ! ietude1d_.resultatsGeneraux().resultatsRubens()); } else if ("RESU_OPTYCA".equals(choix[i])) { Hydraulique1dExport.exportOpthyca(new File(nom + ".opt"), ietude1d_); --- 781,785 ---- Hydraulique1dExport.exportRubens( new File(nom + ".rub"), ! ietude1d_.resultatsGeneraux().resultatsTemporelSpatial()); } else if ("RESU_OPTYCA".equals(choix[i])) { Hydraulique1dExport.exportOpthyca(new File(nom + ".opt"), ietude1d_); *************** *** 791,795 **** Hydraulique1dExport.exportRubens( new File(nom + ".cas_rub"), ! ietude1d_.resultatsGeneraux().resultatsRubensCasier()); } else if ("RESU_CASIER_LISTING".equals(choix[i])) { Hydraulique1dExport.exportListing( --- 791,795 ---- Hydraulique1dExport.exportRubens( new File(nom + ".cas_rub"), ! ietude1d_.resultatsGeneraux().resultatsTemporelCasier()); } else if ("RESU_CASIER_LISTING".equals(choix[i])) { Hydraulique1dExport.exportListing( *************** *** 803,807 **** Hydraulique1dExport.exportRubens( new File(nom + ".liai_rub"), ! ietude1d_.resultatsGeneraux().resultatsRubensCasier()); } else if ("RESU_LIAISON_LISTING".equals(choix[i])) { Hydraulique1dExport.exportListing( --- 803,807 ---- Hydraulique1dExport.exportRubens( new File(nom + ".liai_rub"), ! ietude1d_.resultatsGeneraux().resultatsTemporelLiaison()); } else if ("RESU_LIAISON_LISTING".equals(choix[i])) { Hydraulique1dExport.exportListing( |
|
From: <jm_...@us...> - 2004-03-05 15:17:34
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/idl/code In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16567/dodico/idl/code Modified Files: mascaret.idl Log Message: Index: mascaret.idl =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/idl/code/mascaret.idl,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** mascaret.idl 5 Mar 2004 12:59:30 -0000 1.11 --- mascaret.idl 5 Mar 2004 15:03:24 -0000 1.12 *************** *** 790,793 **** --- 790,794 ---- booleen resultatsLiaison; booleen resultatsCasier; + booleen resultatsPermanent; }; |
|
From: <jm_...@us...> - 2004-03-05 13:42:21
|
Update of /cvsroot/fudaa//fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29280 Added Files: FichierInvalideException.java Log Message: Ajout d'une exception levée lors d'un problème d'interprétation d'un fichier --- NEW FILE: FichierInvalideException.java --- /* * @file FichierInvalideException.java * @creation 2004-02-23 * @modification $Date: 2004/03/05 13:28:15 $ * @license GNU General Public License 2 * @copyright (c)1998-2004 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail de...@fu... */ package org.fudaa.dodico.hydraulique1d; /** * @version $Revision: 1.1 $ $Date: 2004/03/05 13:28:15 $ by $Author: jm_lacombe $ * @author Jean-Marc Lacombe */ public class FichierInvalideException extends Exception { private int numeroLigne_=-1; private String ligne_=null; public FichierInvalideException() { this(-1, null); } public FichierInvalideException(int numeroLigne) { this(numeroLigne, null); } public FichierInvalideException(String ligne) { super(); ligne_ = ligne; } public FichierInvalideException(String ligne, String message) { super(message); ligne_ = ligne; } public FichierInvalideException(int numeroLigne, String ligne, String message) { super(message); numeroLigne_ = numeroLigne; ligne_ = ligne; } public FichierInvalideException(int numeroLigne, String ligne) { super(); numeroLigne_ = numeroLigne; ligne_ = ligne; } public String getLigne() { return ligne_; } public int getNumeroLigne() { return numeroLigne_; } } |
