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
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sisyphe In directory sc8-pr-cvs1:/tmp/cvs-serv28618/sisyphe Modified Files: DParametresSisyphe.java MainTestCas.java MainTestGEO.java MainTestPre.java MainTestPrs.java Log Message: maj import +UsineHelper Index: DParametresSisyphe.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sisyphe/DParametresSisyphe.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DParametresSisyphe.java 18 Mar 2003 15:32:23 -0000 1.3 --- DParametresSisyphe.java 4 Jul 2003 14:04:33 -0000 1.4 *************** *** 10,20 **** package org.fudaa.dodico.sisyphe; ! import java.io.*; ! import java.util.*; ! import org.fudaa.dodico.objet.CDodico; ! import org.fudaa.dodico.calcul.*; ! import org.fudaa.dodico.fortran.*; ! import org.fudaa.dodico.corba.sisyphe.*; /** --- 10,52 ---- package org.fudaa.dodico.sisyphe; ! import java.io.EOFException; ! import java.io.File; ! import java.io.FileInputStream; ! import java.io.FileReader; ! import java.io.FileWriter; ! import java.io.IOException; ! import java.util.Hashtable; ! import java.util.Vector; ! import org.fudaa.dodico.calcul.DParametres; ! import org.fudaa.dodico.corba.sisyphe.IParametresSisypheOperations; ! import org.fudaa.dodico.corba.sisyphe.SParametresCalculCAS; ! import org.fudaa.dodico.corba.sisyphe.SParametresConsPhysCAS; ! import org.fudaa.dodico.corba.sisyphe.SParametresDureeCalcCAS; ! import org.fudaa.dodico.corba.sisyphe.SParametresESFichiersCAS; ! import org.fudaa.dodico.corba.sisyphe.SParametresESGeneralitesCAS; ! import org.fudaa.dodico.corba.sisyphe.SParametresESGraphListCAS; ! import org.fudaa.dodico.corba.sisyphe.SParametresElmtsBlocSisypheGEO; ! import org.fudaa.dodico.corba.sisyphe.SParametresEnvironnementCAS; ! import org.fudaa.dodico.corba.sisyphe.SParametresGeneralCAS; ! import org.fudaa.dodico.corba.sisyphe.SParametresLigneSisypheCOND; ! import org.fudaa.dodico.corba.sisyphe.SParametresLogicielDessinCAS; ! import org.fudaa.dodico.corba.sisyphe.SParametresNoeudsBlocSisypheGEO; ! import org.fudaa.dodico.corba.sisyphe.SParametresNomCAS; ! import org.fudaa.dodico.corba.sisyphe.SParametresParamNumCAS; ! import org.fudaa.dodico.corba.sisyphe.SParametresSisypheCAS; ! import org.fudaa.dodico.corba.sisyphe.SParametresSisypheCOND; ! import org.fudaa.dodico.corba.sisyphe.SParametresSisypheF; ! import org.fudaa.dodico.corba.sisyphe.SParametresSisypheGEO; ! import org.fudaa.dodico.corba.sisyphe.SParametresSisyphePRE; ! import org.fudaa.dodico.corba.sisyphe.SParametresSisypheREF; ! import org.fudaa.dodico.corba.sisyphe.SParametresSolveurCAS; ! import org.fudaa.dodico.corba.sisyphe.SParametresStdCAS; ! import org.fudaa.dodico.corba.sisyphe.SParametresTransSolidCAS; ! import org.fudaa.dodico.corba.sisyphe.SParametresVarsBlocSisypheGEO; ! import org.fudaa.dodico.corba.sisyphe.SResultatsSisypheSOL; ! import org.fudaa.dodico.fortran.FortranBinaryInputStream; ! import org.fudaa.dodico.fortran.FortranReader; ! import org.fudaa.dodico.fortran.FortranWriter; /** Index: MainTestCas.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sisyphe/MainTestCas.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MainTestCas.java 18 Mar 2003 15:32:24 -0000 1.2 --- MainTestCas.java 4 Jul 2003 14:04:33 -0000 1.3 *************** *** 10,15 **** package org.fudaa.dodico.sisyphe; ! import org.fudaa.dodico.corba.sisyphe.*; ! import org.fudaa.dodico.sisyphe.*; /** --- 10,14 ---- package org.fudaa.dodico.sisyphe; ! import org.fudaa.dodico.corba.sisyphe.SParametresSisypheCAS; /** Index: MainTestGEO.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sisyphe/MainTestGEO.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MainTestGEO.java 18 Mar 2003 15:32:24 -0000 1.2 --- MainTestGEO.java 4 Jul 2003 14:04:33 -0000 1.3 *************** *** 10,15 **** package org.fudaa.dodico.sisyphe; ! import org.fudaa.dodico.corba.sisyphe.*; ! import org.fudaa.dodico.sisyphe.*; /** --- 10,14 ---- package org.fudaa.dodico.sisyphe; ! import org.fudaa.dodico.corba.sisyphe.SParametresSisypheGEO; /** Index: MainTestPre.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sisyphe/MainTestPre.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MainTestPre.java 18 Mar 2003 15:32:24 -0000 1.2 --- MainTestPre.java 4 Jul 2003 14:04:33 -0000 1.3 *************** *** 10,15 **** package org.fudaa.dodico.sisyphe; ! import org.fudaa.dodico.corba.sisyphe.*; ! import org.fudaa.dodico.sisyphe.*; /** --- 10,14 ---- package org.fudaa.dodico.sisyphe; ! import org.fudaa.dodico.corba.sisyphe.SParametresSisyphePRE; /** Index: MainTestPrs.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sisyphe/MainTestPrs.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MainTestPrs.java 18 Mar 2003 15:32:23 -0000 1.2 --- MainTestPrs.java 4 Jul 2003 14:04:33 -0000 1.3 *************** *** 10,14 **** package org.fudaa.dodico.sisyphe; - import org.fudaa.dodico.sisyphe.*; /** --- 10,13 ---- |
|
From: <de...@us...> - 2003-07-04 14:04:36
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sipor In directory sc8-pr-cvs1:/tmp/cvs-serv28618/sipor Modified Files: BTest.java DParametresSipor.java TestSiporClient.java Log Message: maj import +UsineHelper Index: BTest.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sipor/BTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** BTest.java 11 Apr 2003 16:09:15 -0000 1.3 --- BTest.java 4 Jul 2003 14:04:33 -0000 1.4 *************** *** 10,18 **** package org.fudaa.dodico.sipor; ! import java.lang.*; ! import java.io.*; ! import java.util.*; ! import org.fudaa.dodico.sipor.*; ! import org.fudaa.dodico.corba.sipor.*; /** --- 10,21 ---- package org.fudaa.dodico.sipor; ! import org.fudaa.dodico.corba.sipor.SParametresCategorie; ! import org.fudaa.dodico.corba.sipor.SParametresCategories; ! import org.fudaa.dodico.corba.sipor.SParametresPeriode; ! import org.fudaa.dodico.corba.sipor.SParametresPerturbateur; ! import org.fudaa.dodico.corba.sipor.SParametresQuai; ! import org.fudaa.dodico.corba.sipor.SParametresQuaiPreferentiel; ! import org.fudaa.dodico.corba.sipor.SParametresQuais; ! import org.fudaa.dodico.corba.sipor.SParametresSipor; /** Index: DParametresSipor.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sipor/DParametresSipor.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DParametresSipor.java 11 Apr 2003 16:09:16 -0000 1.4 --- DParametresSipor.java 4 Jul 2003 14:04:33 -0000 1.5 *************** *** 10,20 **** package org.fudaa.dodico.sipor; ! import java.io.*; ! import java.util.*; import org.fudaa.dodico.objet.CDodico; - import org.fudaa.dodico.calcul.*; - import org.fudaa.dodico.corba.sipor.*; - import org.fudaa.dodico.fortran.*; /** --- 10,28 ---- package org.fudaa.dodico.sipor; ! import java.io.FileWriter; ! import java.io.IOException; + import org.fudaa.dodico.calcul.DParametres; + import org.fudaa.dodico.corba.sipor.IParametresSiporOperations; + import org.fudaa.dodico.corba.sipor.SParametresBassin; + import org.fudaa.dodico.corba.sipor.SParametresCategories; + import org.fudaa.dodico.corba.sipor.SParametresDonneesGenerales; + import org.fudaa.dodico.corba.sipor.SParametresMaree; + import org.fudaa.dodico.corba.sipor.SParametresPerturbateur; + import org.fudaa.dodico.corba.sipor.SParametresQuais; + import org.fudaa.dodico.corba.sipor.SParametresReglesSecurite; + import org.fudaa.dodico.corba.sipor.SParametresSipor; + import org.fudaa.dodico.fortran.FortranWriter; import org.fudaa.dodico.objet.CDodico; /** Index: TestSiporClient.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/sipor/TestSiporClient.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TestSiporClient.java 11 Apr 2003 16:09:17 -0000 1.3 --- TestSiporClient.java 4 Jul 2003 14:04:33 -0000 1.4 *************** *** 10,18 **** package org.fudaa.dodico.sipor; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.objet.*; ! import org.fudaa.dodico.corba.sipor.*; ! import org.fudaa.dodico.sipor.*; ! import java.io.*; /** --- 10,16 ---- package org.fudaa.dodico.sipor; ! import org.fudaa.dodico.corba.sipor.ICalculSipor; ! import org.fudaa.dodico.corba.sipor.ICalculSiporHelper; ! import org.fudaa.dodico.objet.CDodico; /** |
|
From: <de...@us...> - 2003-07-04 14:03:24
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/simboat
In directory sc8-pr-cvs1:/tmp/cvs-serv28393/simboat
Modified Files:
ServeurSimboat.java
Log Message:
maj import +UsineHelper
Index: ServeurSimboat.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/simboat/ServeurSimboat.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ServeurSimboat.java 11 Apr 2003 16:09:14 -0000 1.3
--- ServeurSimboat.java 4 Jul 2003 14:03:21 -0000 1.4
***************
*** 12,16 ****
import java.util.Date;
! import org.fudaa.dodico.objet.*;
/**
--- 12,18 ----
import java.util.Date;
! import org.fudaa.dodico.objet.CDodico;
! import org.fudaa.dodico.objet.ServeurPersonne;
! import org.fudaa.dodico.usine.UsineHelper;
/**
***************
*** 36,40 ****
CDodico.rebind(nom, sim.tie());
//essai de fred deniger
! CDodico.creeUsineLocale();
//fin essai
ServeurPersonne sp=new ServeurPersonne("test-personne-simboat", "test-organisme-simboat");
--- 38,42 ----
CDodico.rebind(nom, sim.tie());
//essai de fred deniger
! UsineHelper.creeUsineLocale();
//fin essai
ServeurPersonne sp=new ServeurPersonne("test-personne-simboat", "test-organisme-simboat");
|
|
From: <de...@us...> - 2003-07-04 14:03:24
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/seuil In directory sc8-pr-cvs1:/tmp/cvs-serv28393/seuil Modified Files: DCalculSeuil.java ServeurSeuil.java Log Message: maj import +UsineHelper Index: DCalculSeuil.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/seuil/DCalculSeuil.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DCalculSeuil.java 11 Apr 2003 16:09:12 -0000 1.4 --- DCalculSeuil.java 4 Jul 2003 14:03:21 -0000 1.5 *************** *** 10,22 **** package org.fudaa.dodico.seuil; ! import java.io.*; ! import java.util.*; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.objet.*; ! import org.fudaa.dodico.corba.calcul.*; ! import org.fudaa.dodico.calcul.*; ! import org.fudaa.dodico.corba.seuil.*; ! import org.fudaa.dodico.fortran.*; /** --- 10,23 ---- package org.fudaa.dodico.seuil; ! import java.io.File; ! import org.fudaa.dodico.calcul.DCalcul; ! import org.fudaa.dodico.corba.objet.IConnexion; ! import org.fudaa.dodico.corba.seuil.ICalculSeuilOperations; ! import org.fudaa.dodico.corba.seuil.IParametresSeuil; ! import org.fudaa.dodico.corba.seuil.IResultatsSeuil; ! import org.fudaa.dodico.corba.seuil.SResultatsSEU; ! import org.fudaa.dodico.objet.CDodico; ! import org.fudaa.dodico.objet.CExec; /** Index: ServeurSeuil.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/seuil/ServeurSeuil.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ServeurSeuil.java 11 Apr 2003 16:09:13 -0000 1.3 --- ServeurSeuil.java 4 Jul 2003 14:03:21 -0000 1.4 *************** *** 10,18 **** package org.fudaa.dodico.seuil; ! import java.net.*; ! import java.util.*; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.objet.*; ! import org.fudaa.dodico.corba.lido.*; /** --- 10,16 ---- package org.fudaa.dodico.seuil; ! import java.util.Date; ! ! import org.fudaa.dodico.objet.CDodico; /** |
|
From: <de...@us...> - 2003-07-04 14:03:23
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/representation
In directory sc8-pr-cvs1:/tmp/cvs-serv28393/representation
Modified Files:
DCarteComplexe.java DCarteHistorique.java DCarteReel.java
Log Message:
maj import +UsineHelper
Index: DCarteComplexe.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/representation/DCarteComplexe.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DCarteComplexe.java 18 Mar 2003 14:57:50 -0000 1.2
--- DCarteComplexe.java 4 Jul 2003 14:03:21 -0000 1.3
***************
*** 10,22 ****
package org.fudaa.dodico.representation;
! import org.fudaa.dodico.corba.objet.*;
! import org.fudaa.dodico.objet.*;
! import org.fudaa.dodico.corba.mathematiques.*;
! import org.fudaa.dodico.mathematiques.*;
! import org.fudaa.dodico.corba.ef.*;
! import org.fudaa.dodico.ef.*;
! import org.fudaa.dodico.corba.mesure.*;
! import org.fudaa.dodico.mesure.*;
! import org.fudaa.dodico.corba.representation.*;
/**
--- 10,21 ----
package org.fudaa.dodico.representation;
! import org.fudaa.dodico.corba.ef.IMaillage;
! import org.fudaa.dodico.corba.mathematiques.SComplexe;
! import org.fudaa.dodico.corba.mesure.LGrandeur;
! import org.fudaa.dodico.corba.representation.ICarteComplexeOperations;
! import org.fudaa.dodico.corba.representation.ICarteReel;
! import org.fudaa.dodico.mathematiques.CMathComplexe;
! import org.fudaa.dodico.objet.CDodico;
! import org.fudaa.dodico.usine.UsineHelper;
/**
***************
*** 73,77 ****
for(int i=0; i<valeurs_.length; i++)
valeurs_re[i]=valeurs_[i].re;
! ICarteReel c=CDodico.findUsine().creeRepresentationCarteReel();
c.grandeur(grandeur_);
c.maillage((IMaillage)maillage_.creeClone());
--- 72,76 ----
for(int i=0; i<valeurs_.length; i++)
valeurs_re[i]=valeurs_[i].re;
! ICarteReel c=UsineHelper.findUsine().creeRepresentationCarteReel();
c.grandeur(grandeur_);
c.maillage((IMaillage)maillage_.creeClone());
***************
*** 85,89 ****
for(int i=0; i<valeurs_.length; i++)
valeurs_im[i]=valeurs_[i].im;
! ICarteReel c=CDodico.findUsine().creeRepresentationCarteReel();
c.grandeur(grandeur_);
c.maillage((IMaillage)maillage_.creeClone());
--- 84,88 ----
for(int i=0; i<valeurs_.length; i++)
valeurs_im[i]=valeurs_[i].im;
! ICarteReel c=UsineHelper.findUsine().creeRepresentationCarteReel();
c.grandeur(grandeur_);
c.maillage((IMaillage)maillage_.creeClone());
***************
*** 97,101 ****
for(int i=0; i<valeurs_.length; i++)
valeurs_mod[i]=CMathComplexe.mod(valeurs_[i]);
! ICarteReel c=CDodico.findUsine().creeRepresentationCarteReel();
c.grandeur(grandeur_);
c.maillage((IMaillage)maillage_.creeClone());
--- 96,100 ----
for(int i=0; i<valeurs_.length; i++)
valeurs_mod[i]=CMathComplexe.mod(valeurs_[i]);
! ICarteReel c=UsineHelper.findUsine().creeRepresentationCarteReel();
c.grandeur(grandeur_);
c.maillage((IMaillage)maillage_.creeClone());
***************
*** 109,113 ****
for(int i=0; i<valeurs_.length; i++)
valeurs_arg[i]=CMathComplexe.arg(valeurs_[i]);
! ICarteReel c=CDodico.findUsine().creeRepresentationCarteReel();
c.grandeur(grandeur_);
c.maillage((IMaillage)maillage_.creeClone());
--- 108,112 ----
for(int i=0; i<valeurs_.length; i++)
valeurs_arg[i]=CMathComplexe.arg(valeurs_[i]);
! ICarteReel c=UsineHelper.findUsine().creeRepresentationCarteReel();
c.grandeur(grandeur_);
c.maillage((IMaillage)maillage_.creeClone());
Index: DCarteHistorique.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/representation/DCarteHistorique.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DCarteHistorique.java 18 Mar 2003 14:57:50 -0000 1.2
--- DCarteHistorique.java 4 Jul 2003 14:03:21 -0000 1.3
***************
*** 10,20 ****
package org.fudaa.dodico.representation;
! import org.fudaa.dodico.corba.objet.*;
! import org.fudaa.dodico.objet.*;
! import org.fudaa.dodico.corba.ef.*;
! import org.fudaa.dodico.ef.*;
! import org.fudaa.dodico.corba.mesure.*;
! import org.fudaa.dodico.mesure.*;
! import org.fudaa.dodico.corba.representation.*;
/**
--- 10,20 ----
package org.fudaa.dodico.representation;
! import org.fudaa.dodico.corba.ef.IMaillage;
! import org.fudaa.dodico.corba.mesure.LGrandeur;
! import org.fudaa.dodico.corba.objet.IObjet;
! import org.fudaa.dodico.corba.representation.ICarteHistorique;
! import org.fudaa.dodico.corba.representation.ICarteHistoriqueOperations;
! import org.fudaa.dodico.corba.representation.ICarteReel;
! import org.fudaa.dodico.corba.representation.IHistoire;
/**
Index: DCarteReel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/representation/DCarteReel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DCarteReel.java 18 Mar 2003 14:57:50 -0000 1.2
--- DCarteReel.java 4 Jul 2003 14:03:21 -0000 1.3
***************
*** 10,20 ****
package org.fudaa.dodico.representation;
! import org.fudaa.dodico.corba.objet.*;
! import org.fudaa.dodico.objet.*;
! import org.fudaa.dodico.corba.ef.*;
! import org.fudaa.dodico.ef.*;
! import org.fudaa.dodico.corba.mesure.*;
! import org.fudaa.dodico.mesure.*;
! import org.fudaa.dodico.corba.representation.*;
/**
--- 10,16 ----
package org.fudaa.dodico.representation;
! import org.fudaa.dodico.corba.ef.IMaillage;
! import org.fudaa.dodico.corba.mesure.LGrandeur;
! import org.fudaa.dodico.corba.representation.ICarteReelOperations;
/**
|
|
From: <de...@us...> - 2003-07-04 14:03:23
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux3d In directory sc8-pr-cvs1:/tmp/cvs-serv28393/reflux3d Modified Files: DResultatsReflux3d.java Log Message: maj import +UsineHelper Index: DResultatsReflux3d.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux3d/DResultatsReflux3d.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DResultatsReflux3d.java 18 Mar 2003 13:42:42 -0000 1.3 --- DResultatsReflux3d.java 4 Jul 2003 14:03:21 -0000 1.4 *************** *** 10,22 **** package org.fudaa.dodico.reflux3d; ! import java.io.*; ! import java.util.*; ! import org.fudaa.dodico.objet.*; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.calcul.*; ! import org.fudaa.dodico.corba.calcul.*; ! import org.fudaa.dodico.fortran.*; ! import org.fudaa.dodico.corba.reflux3d.*; /** --- 10,33 ---- package org.fudaa.dodico.reflux3d; ! import java.io.EOFException; ! import java.io.File; ! import java.io.FileInputStream; ! import java.io.FileNotFoundException; ! import java.io.FileReader; ! import java.io.IOException; ! import java.util.Properties; ! import java.util.Vector; ! import org.fudaa.dodico.calcul.DResultats; ! import org.fudaa.dodico.corba.reflux3d.IParametresReflux3d; ! import org.fudaa.dodico.corba.reflux3d.IResultatsReflux3dOperations; ! import org.fudaa.dodico.corba.reflux3d.SResultatsEtapeR3dSOL; ! import org.fudaa.dodico.corba.reflux3d.SResultatsEtapeR3dVNO; ! import org.fudaa.dodico.corba.reflux3d.SResultatsLigneR3dSOL; ! import org.fudaa.dodico.corba.reflux3d.SResultatsLigneR3dVNO; ! import org.fudaa.dodico.corba.reflux3d.SResultatsR3dSOL; ! import org.fudaa.dodico.corba.reflux3d.SResultatsR3dVNO; ! import org.fudaa.dodico.fortran.FortranReader; ! import org.fudaa.dodico.objet.CDodico; /** |
|
From: <de...@us...> - 2003-07-04 14:01:02
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/refonde In directory sc8-pr-cvs1:/tmp/cvs-serv27746/refonde Modified Files: ServeurRefonde.java Log Message: reflux: maj des classes de lecture/ecriture refonde : maj import + UsineHelper Index: ServeurRefonde.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/refonde/ServeurRefonde.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ServeurRefonde.java 18 Mar 2003 13:48:46 -0000 1.2 --- ServeurRefonde.java 4 Jul 2003 14:00:54 -0000 1.3 *************** *** 10,18 **** package org.fudaa.dodico.refonde; ! import java.net.*; ! import java.util.*; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.objet.*; ! import org.fudaa.dodico.corba.refonde.*; /** --- 10,16 ---- package org.fudaa.dodico.refonde; ! import java.util.Date; ! ! import org.fudaa.dodico.objet.CDodico; /** |
|
From: <de...@us...> - 2003-07-04 14:01:02
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux In directory sc8-pr-cvs1:/tmp/cvs-serv27746/reflux Modified Files: ServeurReflux.java Log Message: reflux: maj des classes de lecture/ecriture refonde : maj import + UsineHelper Index: ServeurReflux.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/ServeurReflux.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ServeurReflux.java 18 Mar 2003 13:37:18 -0000 1.2 --- ServeurReflux.java 4 Jul 2003 14:00:53 -0000 1.3 *************** *** 10,18 **** package org.fudaa.dodico.reflux; ! import java.net.*; ! import java.util.*; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.objet.*; ! import org.fudaa.dodico.corba.reflux.*; /** --- 10,16 ---- package org.fudaa.dodico.reflux; ! import java.util.Date; ! ! import org.fudaa.dodico.objet.CDodico; /** |
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/planification In directory sc8-pr-cvs1:/tmp/cvs-serv27267/planification Modified Files: ComparateurIIntervalleTemps.java DHorloge.java DIntervalleTemps.java DSegmentationTemps.java Log Message: maj UsineHelper + imports Index: ComparateurIIntervalleTemps.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/planification/ComparateurIIntervalleTemps.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ComparateurIIntervalleTemps.java 18 Mar 2003 13:28:57 -0000 1.2 --- ComparateurIIntervalleTemps.java 4 Jul 2003 13:57:48 -0000 1.3 *************** *** 11,17 **** //java import java.util.Comparator; ! import org.omg.CORBA.Object; ! //dodico ! import org.fudaa.dodico.corba.planification.*; /** --- 11,17 ---- //java import java.util.Comparator; ! ! import org.fudaa.dodico.corba.planification.IIntervalleTemps; ! import org.fudaa.dodico.corba.planification.IIntervalleTempsHelper; /** Index: DHorloge.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/planification/DHorloge.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DHorloge.java 18 Mar 2003 13:28:57 -0000 1.2 --- DHorloge.java 4 Jul 2003 13:57:48 -0000 1.3 *************** *** 10,14 **** package org.fudaa.dodico.planification; ! import java.util.*; import org.fudaa.dodico.corba.planification.IHorlogeOperations; --- 10,14 ---- package org.fudaa.dodico.planification; ! import java.util.Calendar; import org.fudaa.dodico.corba.planification.IHorlogeOperations; Index: DIntervalleTemps.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/planification/DIntervalleTemps.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DIntervalleTemps.java 18 Mar 2003 13:28:57 -0000 1.2 --- DIntervalleTemps.java 4 Jul 2003 13:57:48 -0000 1.3 *************** *** 11,15 **** import org.fudaa.dodico.corba.planification.IIntervalleTempsOperations; - import org.fudaa.dodico.objet.DObjet; /** --- 11,14 ---- Index: DSegmentationTemps.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/planification/DSegmentationTemps.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DSegmentationTemps.java 18 Mar 2003 13:28:57 -0000 1.2 --- DSegmentationTemps.java 4 Jul 2003 13:57:48 -0000 1.3 *************** *** 11,15 **** import org.fudaa.dodico.corba.planification.ISegmentationTempsOperations; - import org.fudaa.dodico.objet.DObjet; /** --- 11,14 ---- |
|
From: <de...@us...> - 2003-07-04 13:54:59
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/usine
In directory sc8-pr-cvs1:/tmp/cvs-serv26893/usine
Added Files:
UsineHelper.java
Log Message:
Classe permettant de ce connecter a une usine.
LEs methode de CDodico sont obsoletes
--- NEW FILE: UsineHelper.java ---
/*
* @file UsineHelper.java
* @creation 24 juin 2003
* @modification $Date: 2003/07/04 13:54:56 $
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
*/
package org.fudaa.dodico.usine;
import org.fudaa.dodico.corba.objet.IObjet;
import org.fudaa.dodico.corba.usine.IUsine;
import org.fudaa.dodico.corba.usine.IUsineHelper;
import org.fudaa.dodico.objet.CDodico;
/**
* @author deniger
* @version $Id: UsineHelper.java,v 1.1 2003/07/04 13:54:56 deniger Exp $
*/
public class UsineHelper
{
/**
* Reference l'usine locale utilisee. Est nulle, si la connexion se fait a
* distance.
*/
private static IUsine localUsine_=null;
/**
*
*/
private UsineHelper()
{
super();
}
public final static IUsine findUsine(int _time)
{
if( localUsine_!=null ) return localUsine_;
int n=0;
IUsine u=null;
while( n<3 && u==null ) {
u=IUsineHelper.narrow(CDodico.findServerByInterface("::usine::IUsine", _time));
n++;
}
return u;
}
public final static IUsine findUsine()
{
return findUsine(2000);
/* if( localUsine_!=null ) return localUsine_;
int n=0;
IUsine u=null;
while( n<3 && u==null ) {
u=IUsineHelper.narrow(findServerByInterface("::usine::IUsine", 2000));
n++;
}
return u; */
}
public final static IUsine creeUsineLocale()
{
if(localUsine_!=null) return localUsine_;
// System.err.println("CDodico: création de l'usine locale");
try
{
DUsine u=new DUsine();
// Class usineClass=Class.forName("org.fudaa.dodico.usine.DUsine");
// java.lang.Object usineObj=usineClass.newInstance();
u.setUsineLocale(true);
// Method m=usineClass.getMethod("setUsineLocale",
// new Class[]{java.lang.Boolean.TYPE});
// m.invoke(usineObj,new java.lang.Object[]{new Boolean(true)});
// m=usineClass.getMethod("tie",new Class[0]);
// localUsine_=IUsineHelper.narrow((IObjet)(m.invoke(usineObj,new java.lang.Object[0])));
localUsine_=IUsineHelper.narrow((IObjet)u.tie());
if(localUsine_==null) System.out.println("NON LOCALE");
// System.out.println("CDodico: création de l'usine locale FIN");
}
catch(Exception e)
{
localUsine_=null;
System.err.println(e);
}
return localUsine_;
}
}
|
|
From: <de...@us...> - 2003-07-04 13:52:09
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navmer In directory sc8-pr-cvs1:/tmp/cvs-serv26619/navmer Modified Files: ClientNavmer.java Log Message: maj import + UsineHelper Index: ClientNavmer.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navmer/ClientNavmer.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ClientNavmer.java 18 Mar 2003 13:14:40 -0000 1.3 --- ClientNavmer.java 4 Jul 2003 13:52:02 -0000 1.4 *************** *** 10,29 **** package org.fudaa.dodico.navmer; ! import java.io.*; ! import java.util.*; ! import java.lang.*; ! import org.fudaa.dodico.corba.calcul.*; ! import org.fudaa.dodico.objet.*; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.fortran.*; ! import org.fudaa.dodico.corba.navmer.*; ! import org.fudaa.dodico.navmer.*; ! import javax.swing.*; ! import javax.swing.border.Border; ! import javax.swing.event.*; ! import java.awt.*; ! import java.awt.event.*; /** --- 10,22 ---- package org.fudaa.dodico.navmer; ! import java.awt.Color; ! import java.awt.Graphics; ! import javax.swing.JPanel; ! import org.fudaa.dodico.corba.navmer.ICalculNavmer; ! import org.fudaa.dodico.corba.navmer.ICalculNavmerHelper; ! import org.fudaa.dodico.corba.navmer.SResultatsDAT; ! import org.fudaa.dodico.objet.CDodico; /** |
|
From: <de...@us...> - 2003-07-04 13:52:09
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/oscar
In directory sc8-pr-cvs1:/tmp/cvs-serv26619/oscar
Modified Files:
OscarClient.java ServeurOscar.java
Log Message:
maj import + UsineHelper
Index: OscarClient.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/oscar/OscarClient.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** OscarClient.java 18 Mar 2003 13:28:59 -0000 1.2
--- OscarClient.java 4 Jul 2003 13:52:02 -0000 1.3
***************
*** 12,15 ****
--- 12,16 ----
import org.fudaa.dodico.corba.objet.*;
import org.fudaa.dodico.objet.*;
+ import org.fudaa.dodico.usine.UsineHelper;
import org.fudaa.dodico.corba.usine.IUsine;
import org.fudaa.dodico.corba.oscar.*;
***************
*** 45,49 ****
// Création du serveur
System.out.println("creation du serveur");
! IUsine usine=CDodico.creeUsineLocale();
IPersonne p=usine.creeObjetPersonne();
IOrganisme o=usine.creeObjetOrganisme();
--- 46,50 ----
// Création du serveur
System.out.println("creation du serveur");
! IUsine usine=UsineHelper.creeUsineLocale();
IPersonne p=usine.creeObjetPersonne();
IOrganisme o=usine.creeObjetOrganisme();
Index: ServeurOscar.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/oscar/ServeurOscar.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ServeurOscar.java 18 Mar 2003 13:28:59 -0000 1.2
--- ServeurOscar.java 4 Jul 2003 13:52:02 -0000 1.3
***************
*** 10,17 ****
package org.fudaa.dodico.oscar;
! import org.fudaa.dodico.corba.objet.*;
! import org.fudaa.dodico.objet.*;
! import org.fudaa.dodico.corba.oscar.*;
! import java.util.*;
/**
--- 10,16 ----
package org.fudaa.dodico.oscar;
! import java.util.Date;
!
! import org.fudaa.dodico.objet.CDodico;
/**
|
|
From: <de...@us...> - 2003-07-04 13:52:09
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/ef
In directory sc8-pr-cvs1:/tmp/cvs-serv26619/ef
Modified Files:
DElement.java DMaillage.java DParametresCalcul.java
Log Message:
maj import + UsineHelper
Index: DElement.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/ef/DElement.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DElement.java 1 Apr 2003 09:39:15 -0000 1.3
--- DElement.java 4 Jul 2003 13:52:02 -0000 1.4
***************
*** 14,17 ****
--- 14,18 ----
import org.fudaa.dodico.corba.usine.IUsine;
import org.fudaa.dodico.objet.*;
+ import org.fudaa.dodico.usine.UsineHelper;
/**
***************
*** 190,194 ****
}
IArete[] aretes = new IArete[iNoeuds.length];
! IUsine u = CDodico.findUsine();
if(u == null)
{
--- 191,195 ----
}
IArete[] aretes = new IArete[iNoeuds.length];
! IUsine u = UsineHelper.findUsine();
if(u == null)
{
Index: DMaillage.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/ef/DMaillage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DMaillage.java 1 Apr 2003 09:39:13 -0000 1.3
--- DMaillage.java 4 Jul 2003 13:52:02 -0000 1.4
***************
*** 16,19 ****
--- 16,20 ----
import org.fudaa.dodico.corba.usine.IUsine;
import org.fudaa.dodico.objet.*;
+ import org.fudaa.dodico.usine.UsineHelper;
/**
***************
*** 485,489 ****
int numero;
INoeud[] noeuds;
! IUsine u=CDodico.findUsine();
if(u == null)
{
--- 486,490 ----
int numero;
INoeud[] noeuds;
! IUsine u=UsineHelper.findUsine();
if(u == null)
{
Index: DParametresCalcul.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/ef/DParametresCalcul.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DParametresCalcul.java 1 Apr 2003 09:39:15 -0000 1.3
--- DParametresCalcul.java 4 Jul 2003 13:52:02 -0000 1.4
***************
*** 10,16 ****
package org.fudaa.dodico.ef;
! import org.fudaa.dodico.corba.ef.*;
import org.fudaa.dodico.corba.geometrie.LTypeElement;
! import org.fudaa.dodico.objet.*;
/**
--- 10,16 ----
package org.fudaa.dodico.ef;
! import org.fudaa.dodico.corba.ef.IParametresCalculOperations;
import org.fudaa.dodico.corba.geometrie.LTypeElement;
! import org.fudaa.dodico.objet.DObjet;
/**
|
|
From: <de...@us...> - 2003-07-04 13:49:48
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux
In directory sc8-pr-cvs1:/tmp/cvs-serv26354/reflux
Added Files:
RefluxExec.java
Log Message:
Classe permettant de lancer le code reflux dans le repertoire du fichier
inp
--- NEW FILE: RefluxExec.java ---
/*
* @file RefluxLauncher.java
* @creation 12 juin 2003
* @modification $Date: 2003/07/04 13:49:45 $
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
*/
package org.fudaa.dodico.reflux;
import java.io.File;
import com.memoire.fu.FuLib;
import org.fudaa.dodico.calcul.CalculExec;
import org.fudaa.dodico.calcul.CalculLauncher;
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoUI;
/**
* @author deniger
* @version $Id: RefluxExec.java,v 1.1 2003/07/04 13:49:45 deniger Exp $
*/
public class RefluxExec extends CalculExec
{
/**
* les arguments _codeArgs sont ignores.
*/
public String[] getLaunchArray(
File _paramsFile,
String[] _codeArgs,
DodicoUI _ui)
{
if (FuLib.isWindows())
return CalculExec.manageLauncher(
"reflux",
"reflux.exe",
"reflux-launch.tpl.bat",
"reflux-launch.bat",
computeArgs(CalculExec.getWinParams(_paramsFile, null)),
_ui);
else if (FuLib.isLinux())
return CalculExec.manageLauncher(
"reflux",
"reflux-Linux.x",
"reflux-launch.tpl.sh",
"reflux-launch.sh",
computeArgs(CalculExec.getUnixParams(_paramsFile, null)),
_ui);
else
{
return null;
}
}
public int getMaxArgsNb()
{
return 0;
}
private String[] computeArgs(String[] _args)
{
if (_args != null)
{
int n= _args.length - 1;
if (n >= 0)
_args[n]= DodicoLib.getSansExtension(_args[n]);
}
return _args;
}
}
|
|
From: <de...@us...> - 2003-07-04 13:47:38
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet
In directory sc8-pr-cvs1:/tmp/cvs-serv26051/objet
Added Files:
CExecListener.java
Log Message:
Un listener pour la classe CExec : permet d'arreter le processus si
necessaire
--- NEW FILE: CExecListener.java ---
/*
* @file CExecListener.java
* @creation 13 juin 2003
* @modification $Date: 2003/07/04 13:47:34 $
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
*/
package org.fudaa.dodico.objet;
/**
* Une interface qui permet a une classe de
* @author fred deniger
* @version $Id: CExecListener.java,v 1.1 2003/07/04 13:47:34 deniger Exp $
*
*/
public interface CExecListener
{
public void setProcess(Process p);
}
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navigation
In directory sc8-pr-cvs1:/tmp/cvs-serv25393/navigation
Modified Files:
Client.java DBassinFlot.java
DDureesManoeuvresEcluseFluviale.java DEcluseFluviale.java
DEcluseMaritime.java DGare.java DGenerationDeterministe.java
DGenerationJournaliereAleatoire.java DManoeuvreQuai.java
DOuvrage.java DOuvrageEntreGares.java
DRegleSecuriteEntreeSortie.java DServiceSinavi.java
DTrajetFluvial.java Serveur.java
Log Message:
maj import + UsineHelper
Index: Client.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navigation/Client.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Client.java 18 Mar 2003 13:14:40 -0000 1.2
--- Client.java 4 Jul 2003 13:43:21 -0000 1.3
***************
*** 13,20 ****
import java.text.*;
//dodico
- import org.fudaa.dodico.navigation.*;
import org.fudaa.dodico.corba.navigation.*;
import org.fudaa.dodico.corba.probabilite.*;
import org.fudaa.dodico.objet.*;
import org.fudaa.dodico.corba.objet.*;
import org.fudaa.dodico.corba.usine.IUsine;
--- 13,20 ----
import java.text.*;
//dodico
import org.fudaa.dodico.corba.navigation.*;
import org.fudaa.dodico.corba.probabilite.*;
import org.fudaa.dodico.objet.*;
+ import org.fudaa.dodico.usine.UsineHelper;
import org.fudaa.dodico.corba.objet.*;
import org.fudaa.dodico.corba.usine.IUsine;
***************
*** 38,42 ****
public static void main(String[] args)
{
! IUsine usine=CDodico.creeUsineLocale();
IEtudeNavigationFluviale etu=usine.creeNavigationEtudeNavigationFluviale();
--- 38,42 ----
public static void main(String[] args)
{
! IUsine usine=UsineHelper.creeUsineLocale();
IEtudeNavigationFluviale etu=usine.creeNavigationEtudeNavigationFluviale();
Index: DBassinFlot.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navigation/DBassinFlot.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DBassinFlot.java 18 Mar 2003 13:14:40 -0000 1.2
--- DBassinFlot.java 4 Jul 2003 13:43:22 -0000 1.3
***************
*** 11,17 ****
//dodico
! import org.fudaa.dodico.corba.navigation.*;
! import org.fudaa.dodico.corba.usine.IUsine;
! import org.fudaa.dodico.objet.CDodico;
/**
--- 11,16 ----
//dodico
! import org.fudaa.dodico.corba.navigation.IBassinFlotOperations;
! import org.fudaa.dodico.corba.navigation.IEcluseMaritime;
/**
Index: DDureesManoeuvresEcluseFluviale.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navigation/DDureesManoeuvresEcluseFluviale.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DDureesManoeuvresEcluseFluviale.java 18 Mar 2003 13:14:40 -0000 1.2
--- DDureesManoeuvresEcluseFluviale.java 4 Jul 2003 13:43:22 -0000 1.3
***************
*** 10,15 ****
package org.fudaa.dodico.navigation;
! import org.fudaa.dodico.corba.navigation.*;
! import org.fudaa.dodico.objet.CDodico;
/**
--- 10,14 ----
package org.fudaa.dodico.navigation;
! import org.fudaa.dodico.corba.navigation.IDureesManoeuvresEcluseFluvialeOperations;
/**
Index: DEcluseFluviale.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navigation/DEcluseFluviale.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DEcluseFluviale.java 18 Mar 2003 13:14:40 -0000 1.2
--- DEcluseFluviale.java 4 Jul 2003 13:43:22 -0000 1.3
***************
*** 10,16 ****
package org.fudaa.dodico.navigation;
! import org.fudaa.dodico.corba.navigation.*;
import org.fudaa.dodico.corba.usine.IUsine;
import org.fudaa.dodico.objet.CDodico;
/**
--- 10,19 ----
package org.fudaa.dodico.navigation;
! import org.fudaa.dodico.corba.navigation.IDureesManoeuvresEcluseFluviale;
! import org.fudaa.dodico.corba.navigation.IEcluseFluvialeOperations;
! import org.fudaa.dodico.corba.navigation.INavireType;
import org.fudaa.dodico.corba.usine.IUsine;
import org.fudaa.dodico.objet.CDodico;
+ import org.fudaa.dodico.usine.UsineHelper;
/**
***************
*** 426,430 ****
return retour.toString();
}
! IUsine usine=CDodico.findUsine();
if(usine == null)
{
--- 429,433 ----
return retour.toString();
}
! IUsine usine=UsineHelper.findUsine();
if(usine == null)
{
Index: DEcluseMaritime.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navigation/DEcluseMaritime.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DEcluseMaritime.java 18 Mar 2003 13:14:40 -0000 1.2
--- DEcluseMaritime.java 4 Jul 2003 13:43:22 -0000 1.3
***************
*** 14,17 ****
--- 14,18 ----
import org.fudaa.dodico.corba.usine.IUsine;
import org.fudaa.dodico.objet.CDodico;
+ import org.fudaa.dodico.usine.UsineHelper;
/**
***************
*** 316,320 ****
}
! IUsine usine=CDodico.findUsine();
if(usine == null)
{
--- 317,321 ----
}
! IUsine usine=UsineHelper.findUsine();
if(usine == null)
{
Index: DGare.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navigation/DGare.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DGare.java 18 Mar 2003 13:14:40 -0000 1.2
--- DGare.java 4 Jul 2003 13:43:22 -0000 1.3
***************
*** 125,129 ****
return "\nNouvel élément invalide:" + _entree.valide();
}
! if( ( _entree.gareArrivee() ).egale( tie_ ) )
{
return "\nLa gare d'arrivée du trajet est identique à la gare de départ.";
--- 125,129 ----
return "\nNouvel élément invalide:" + _entree.valide();
}
! if( egale( _entree.gareArrivee() ) )
{
return "\nLa gare d'arrivée du trajet est identique à la gare de départ.";
Index: DGenerationDeterministe.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navigation/DGenerationDeterministe.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DGenerationDeterministe.java 18 Mar 2003 13:14:40 -0000 1.2
--- DGenerationDeterministe.java 4 Jul 2003 13:43:22 -0000 1.3
***************
*** 10,18 ****
package org.fudaa.dodico.navigation;
import com.memoire.fu.FuVectorlong;
! //java
! import java.util.*;
! //dodico
! import org.fudaa.dodico.corba.navigation.*;
! import org.fudaa.dodico.objet.*;
/**
--- 10,16 ----
package org.fudaa.dodico.navigation;
import com.memoire.fu.FuVectorlong;
!
! import org.fudaa.dodico.corba.navigation.IGenerationDeterministeOperations;
! import org.fudaa.dodico.corba.navigation.LTypeLoi;
/**
Index: DGenerationJournaliereAleatoire.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navigation/DGenerationJournaliereAleatoire.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DGenerationJournaliereAleatoire.java 18 Mar 2003 13:14:40 -0000 1.3
--- DGenerationJournaliereAleatoire.java 4 Jul 2003 13:43:22 -0000 1.4
***************
*** 11,15 ****
import com.memoire.fu.FuVectorlong;
- import java.lang.Math;
//java
import java.util.*;
--- 11,14 ----
***************
*** 18,21 ****
--- 17,21 ----
import org.fudaa.dodico.corba.probabilite.*;
import org.fudaa.dodico.objet.*;
+ import org.fudaa.dodico.usine.UsineHelper;
/**
***************
*** 171,175 ****
{
System.err.println("Echec de connection par réseau");
! GENERATEUR =CDodico.findUsine().creeProbabiliteGenerateurLoiErlang();
}
}
--- 171,175 ----
{
System.err.println("Echec de connection par réseau");
! GENERATEUR =UsineHelper.findUsine().creeProbabiliteGenerateurLoiErlang();
}
}
Index: DManoeuvreQuai.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navigation/DManoeuvreQuai.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DManoeuvreQuai.java 18 Mar 2003 13:14:40 -0000 1.2
--- DManoeuvreQuai.java 4 Jul 2003 13:43:22 -0000 1.3
***************
*** 12,19 ****
import java.io.Serializable;
! import org.fudaa.dodico.corba.navigation.*;
! import org.fudaa.dodico.corba.probabilite.*;
import org.fudaa.dodico.objet.DObjet;
- import org.fudaa.dodico.objet.CDodico;
/**
--- 12,20 ----
import java.io.Serializable;
! import org.fudaa.dodico.corba.navigation.IManoeuvreQuaiOperations;
! import org.fudaa.dodico.corba.navigation.INavireType;
! import org.fudaa.dodico.corba.probabilite.IGenerateurLoiErlang;
! import org.fudaa.dodico.corba.probabilite.SParametresGenerateurLoiErlang;
import org.fudaa.dodico.objet.DObjet;
/**
Index: DOuvrage.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navigation/DOuvrage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DOuvrage.java 18 Mar 2003 13:14:40 -0000 1.2
--- DOuvrage.java 4 Jul 2003 13:43:22 -0000 1.3
***************
*** 16,19 ****
--- 16,20 ----
import org.fudaa.dodico.objet.CDodico;
import org.fudaa.dodico.objet.DObjet;
+ import org.fudaa.dodico.usine.UsineHelper;
import org.fudaa.dodico.corba.usine.IUsine;
***************
*** 236,240 ****
{
! IUsine usine = CDodico.findUsine();
if(usine == null)
{
--- 237,241 ----
{
! IUsine usine = UsineHelper.findUsine();
if(usine == null)
{
***************
*** 368,372 ****
public String ajouteCreneauConstant(long _heureDebut, long _heureFin)
{
! IUsine usine = CDodico.findUsine();
if(usine == null)
{
--- 369,373 ----
public String ajouteCreneauConstant(long _heureDebut, long _heureFin)
{
! IUsine usine = UsineHelper.findUsine();
if(usine == null)
{
Index: DOuvrageEntreGares.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navigation/DOuvrageEntreGares.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DOuvrageEntreGares.java 18 Mar 2003 13:14:40 -0000 1.2
--- DOuvrageEntreGares.java 4 Jul 2003 13:43:22 -0000 1.3
***************
*** 10,16 ****
package org.fudaa.dodico.navigation;
//java
! import java.util.*;
! //dodico
! import org.fudaa.dodico.corba.navigation.*;
/**
--- 10,15 ----
package org.fudaa.dodico.navigation;
//java
! import org.fudaa.dodico.corba.navigation.IGare;
! import org.fudaa.dodico.corba.navigation.IOuvrageEntreGaresOperations;
/**
Index: DRegleSecuriteEntreeSortie.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navigation/DRegleSecuriteEntreeSortie.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DRegleSecuriteEntreeSortie.java 18 Mar 2003 13:14:40 -0000 1.2
--- DRegleSecuriteEntreeSortie.java 4 Jul 2003 13:43:22 -0000 1.3
***************
*** 12,18 ****
import java.io.Serializable;
! import org.fudaa.dodico.corba.navigation.*;
import org.fudaa.dodico.objet.DObjet;
- import org.fudaa.dodico.objet.CDodico;
/**
--- 12,17 ----
import java.io.Serializable;
! import org.fudaa.dodico.corba.navigation.IRegleSecuriteEntreeSortieOperations;
import org.fudaa.dodico.objet.DObjet;
/**
Index: DServiceSinavi.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navigation/DServiceSinavi.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DServiceSinavi.java 18 Mar 2003 13:14:40 -0000 1.2
--- DServiceSinavi.java 4 Jul 2003 13:43:22 -0000 1.3
***************
*** 10,20 ****
package org.fudaa.dodico.navigation;
! import org.fudaa.dodico.corba.navigation.*;
! import org.fudaa.dodico.corba.sinavi.*;
import org.fudaa.dodico.objet.DService;
- import org.fudaa.dodico.corba.usine.IUsine;
- import org.fudaa.dodico.objet.CDodico;
- import org.fudaa.dodico.objet.*;
- import java.util.*;
/**
--- 10,31 ----
package org.fudaa.dodico.navigation;
! import java.util.Arrays;
! import java.util.Comparator;
! import java.util.Vector;
!
! import org.fudaa.dodico.corba.navigation.IBiefNavigationHelper;
! import org.fudaa.dodico.corba.navigation.ICreneauHelper;
! import org.fudaa.dodico.corba.navigation.IEcluseFluvialeHelper;
! import org.fudaa.dodico.corba.navigation.IEtudeNavigationFluviale;
! import org.fudaa.dodico.corba.navigation.IGare;
! import org.fudaa.dodico.corba.navigation.IGareHelper;
! import org.fudaa.dodico.corba.navigation.IGenerationJournaliereAleatoireHelper;
! import org.fudaa.dodico.corba.navigation.INavireType;
! import org.fudaa.dodico.corba.navigation.INavireTypeHelper;
! import org.fudaa.dodico.corba.navigation.IServiceSinaviOperations;
! import org.fudaa.dodico.corba.sinavi.SResuInter;
! import org.fudaa.dodico.corba.sinavi.SResultatsEcluses;
! import org.fudaa.dodico.corba.sinavi.SResultatsGares;
import org.fudaa.dodico.objet.DService;
/**
Index: DTrajetFluvial.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navigation/DTrajetFluvial.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DTrajetFluvial.java 18 Mar 2003 13:14:40 -0000 1.2
--- DTrajetFluvial.java 4 Jul 2003 13:43:22 -0000 1.3
***************
*** 10,15 ****
package org.fudaa.dodico.navigation;
! import org.fudaa.dodico.corba.navigation.*;
! import org.fudaa.dodico.objet.CDodico;
/**
--- 10,15 ----
package org.fudaa.dodico.navigation;
! import org.fudaa.dodico.corba.navigation.IGare;
! import org.fudaa.dodico.corba.navigation.ITrajetFluvialOperations;
/**
Index: Serveur.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navigation/Serveur.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Serveur.java 18 Mar 2003 13:14:40 -0000 1.2
--- Serveur.java 4 Jul 2003 13:43:22 -0000 1.3
***************
*** 11,18 ****
//java
import java.util.Date;
- //dodico
- import org.fudaa.dodico.corba.navigation.*;
! import org.fudaa.dodico.objet.*;
/**
--- 11,16 ----
//java
import java.util.Date;
! import org.fudaa.dodico.objet.CDodico;
/**
|
|
From: <de...@us...> - 2003-07-04 13:43:25
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/lido In directory sc8-pr-cvs1:/tmp/cvs-serv25393/lido Modified Files: DCalculLido.java DParametresLido.java Log Message: maj import + UsineHelper Index: DCalculLido.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/lido/DCalculLido.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DCalculLido.java 11 Apr 2003 16:08:58 -0000 1.4 --- DCalculLido.java 4 Jul 2003 13:43:21 -0000 1.5 *************** *** 10,22 **** package org.fudaa.dodico.lido; ! import java.io.*; ! import java.util.*; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.objet.*; ! import org.fudaa.dodico.corba.calcul.*; ! import org.fudaa.dodico.calcul.*; ! import org.fudaa.dodico.corba.lido.*; ! import org.fudaa.dodico.fortran.*; /** --- 10,25 ---- package org.fudaa.dodico.lido; ! import java.io.File; ! import org.fudaa.dodico.calcul.DCalcul; ! import org.fudaa.dodico.corba.calcul.SProgression; ! import org.fudaa.dodico.corba.lido.ICalculLidoOperations; ! import org.fudaa.dodico.corba.lido.IParametresLido; ! import org.fudaa.dodico.corba.lido.IResultatsLido; ! import org.fudaa.dodico.corba.lido.SResultatsERN; ! import org.fudaa.dodico.corba.lido.SResultatsRSN; ! import org.fudaa.dodico.corba.objet.IConnexion; ! import org.fudaa.dodico.objet.CDodico; ! import org.fudaa.dodico.objet.CExec; /** Index: DParametresLido.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/lido/DParametresLido.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DParametresLido.java 11 Apr 2003 16:08:58 -0000 1.4 --- DParametresLido.java 4 Jul 2003 13:43:21 -0000 1.5 *************** *** 10,22 **** package org.fudaa.dodico.lido; ! import java.io.*; ! import java.util.*; ! import org.fudaa.dodico.objet.*; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.calcul.*; ! import org.fudaa.dodico.corba.calcul.*; ! import org.fudaa.dodico.corba.lido.*; ! import org.fudaa.dodico.fortran.*; /** --- 10,63 ---- package org.fudaa.dodico.lido; ! import java.io.BufferedReader; ! import java.io.BufferedWriter; ! import java.io.File; ! import java.io.FileInputStream; ! import java.io.FileOutputStream; ! import java.io.FileReader; ! import java.io.FileWriter; ! import java.io.IOException; ! import java.io.InputStreamReader; ! import java.io.OutputStreamWriter; ! import org.fudaa.dodico.calcul.DParametres; ! import org.fudaa.dodico.corba.lido.IParametresLidoOperations; ! import org.fudaa.dodico.corba.lido.SParametresApportLigneCLM; ! import org.fudaa.dodico.corba.lido.SParametresBiefBlocPRO; ! import org.fudaa.dodico.corba.lido.SParametresBiefLimBlocRZO; ! import org.fudaa.dodico.corba.lido.SParametresBiefLimLigneRZO; ! import org.fudaa.dodico.corba.lido.SParametresBiefNoeudBlocRZO; ! import org.fudaa.dodico.corba.lido.SParametresBiefNoeudLigneRZO; ! import org.fudaa.dodico.corba.lido.SParametresBiefSingBlocRZO; ! import org.fudaa.dodico.corba.lido.SParametresBiefSingLigneRZO; ! import org.fudaa.dodico.corba.lido.SParametresBiefSituBlocRZO; ! import org.fudaa.dodico.corba.lido.SParametresBiefSituLigneRZO; ! import org.fudaa.dodico.corba.lido.SParametresCAL; ! import org.fudaa.dodico.corba.lido.SParametresCLM; ! import org.fudaa.dodico.corba.lido.SParametresCondLimBlocCLM; ! import org.fudaa.dodico.corba.lido.SParametresCondLimPointLigneCLM; ! import org.fudaa.dodico.corba.lido.SParametresDonBiefBlocPRO; ! import org.fudaa.dodico.corba.lido.SParametresEXT; ! import org.fudaa.dodico.corba.lido.SParametresFIC; ! import org.fudaa.dodico.corba.lido.SParametresFicCAL; ! import org.fudaa.dodico.corba.lido.SParametresGenCAL; ! import org.fudaa.dodico.corba.lido.SParametresLIG; ! import org.fudaa.dodico.corba.lido.SParametresLimBiefLIG; ! import org.fudaa.dodico.corba.lido.SParametresPRO; ! import org.fudaa.dodico.corba.lido.SParametresPasLigneCAL; ! import org.fudaa.dodico.corba.lido.SParametresPerteLigneCLM; ! import org.fudaa.dodico.corba.lido.SParametresPlaniCAL; ! import org.fudaa.dodico.corba.lido.SParametresRZO; ! import org.fudaa.dodico.corba.lido.SParametresSNG; ! import org.fudaa.dodico.corba.lido.SParametresSectionBlocCAL; ! import org.fudaa.dodico.corba.lido.SParametresSectionLigneCAL; ! import org.fudaa.dodico.corba.lido.SParametresSectionsCAL; ! import org.fudaa.dodico.corba.lido.SParametresSerieBlocCAL; ! import org.fudaa.dodico.corba.lido.SParametresSerieLigneCAL; ! import org.fudaa.dodico.corba.lido.SParametresSingBlocSNG; ! import org.fudaa.dodico.corba.lido.SParametresTempCAL; ! import org.fudaa.dodico.fortran.FortranReader; ! import org.fudaa.dodico.fortran.FortranWriter; ! import org.fudaa.dodico.objet.CExec; /** |
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mesure
In directory sc8-pr-cvs1:/tmp/cvs-serv24626
Modified Files:
DEvolutionComposee.java DEvolutionConstante.java
DEvolutionModelisee.java DEvolutionSerieIrreguliere.java
DEvolutionSerieReguliere.java
Log Message:
maj import +UsineHelper
Index: DEvolutionComposee.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mesure/DEvolutionComposee.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DEvolutionComposee.java 18 Mar 2003 13:14:41 -0000 1.2
--- DEvolutionComposee.java 4 Jul 2003 13:37:12 -0000 1.3
***************
*** 11,14 ****
--- 11,15 ----
import org.fudaa.dodico.objet.CDodico;
+ import org.fudaa.dodico.usine.UsineHelper;
import org.fudaa.dodico.corba.collection.ITableau;
import org.fudaa.dodico.corba.mesure.*;
***************
*** 34,38 ****
public DEvolutionComposee()
{
! evolutions_ = CDodico.findUsine().creeCollectionTableau();
}
--- 35,39 ----
public DEvolutionComposee()
{
! evolutions_ = UsineHelper.findUsine().creeCollectionTableau();
}
Index: DEvolutionConstante.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mesure/DEvolutionConstante.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DEvolutionConstante.java 18 Mar 2003 13:14:41 -0000 1.2
--- DEvolutionConstante.java 4 Jul 2003 13:37:12 -0000 1.3
***************
*** 11,14 ****
--- 11,15 ----
import org.fudaa.dodico.objet.CDodico;
+ import org.fudaa.dodico.usine.UsineHelper;
import org.fudaa.dodico.corba.planification.IIntervalleTemps;
import org.fudaa.dodico.corba.mesure.*;
***************
*** 47,51 ****
public DEvolutionConstante()
{
! instants_ = CDodico.findUsine().creePlanificationIntervalleTemps();
instants_.modifieDebut(0);
instants_.modifieFin(Integer.MAX_VALUE);
--- 48,52 ----
public DEvolutionConstante()
{
! instants_ = UsineHelper.findUsine().creePlanificationIntervalleTemps();
instants_.modifieDebut(0);
instants_.modifieFin(Integer.MAX_VALUE);
Index: DEvolutionModelisee.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mesure/DEvolutionModelisee.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DEvolutionModelisee.java 18 Mar 2003 13:14:41 -0000 1.2
--- DEvolutionModelisee.java 4 Jul 2003 13:37:12 -0000 1.3
***************
*** 11,14 ****
--- 11,15 ----
import org.fudaa.dodico.objet.CDodico;
+ import org.fudaa.dodico.usine.UsineHelper;
import org.fudaa.dodico.corba.usine.IUsine;
***************
*** 43,47 ****
public DEvolutionModelisee()
{
! IUsine u = CDodico.findUsine();
instants_ = u.creePlanificationIntervalleTemps();
fonction_ = u.creeMathematiquesFonctionReel();
--- 44,48 ----
public DEvolutionModelisee()
{
! IUsine u = UsineHelper.findUsine();
instants_ = u.creePlanificationIntervalleTemps();
fonction_ = u.creeMathematiquesFonctionReel();
Index: DEvolutionSerieIrreguliere.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mesure/DEvolutionSerieIrreguliere.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DEvolutionSerieIrreguliere.java 18 Mar 2003 13:14:41 -0000 1.3
--- DEvolutionSerieIrreguliere.java 4 Jul 2003 13:37:12 -0000 1.4
***************
*** 16,19 ****
--- 16,20 ----
import org.fudaa.dodico.objet.CDodico;
import org.fudaa.dodico.objet.DObjet;
+ import org.fudaa.dodico.usine.UsineHelper;
/**
***************
*** 48,52 ****
public DEvolutionSerieIrreguliere()
{
! instants_ = CDodico.findUsine().creePlanificationSegmentationTemps();
serie_ = new double[0];
}
--- 49,53 ----
public DEvolutionSerieIrreguliere()
{
! instants_ = UsineHelper.findUsine().creePlanificationSegmentationTemps();
serie_ = new double[0];
}
Index: DEvolutionSerieReguliere.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mesure/DEvolutionSerieReguliere.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DEvolutionSerieReguliere.java 18 Mar 2003 13:14:41 -0000 1.2
--- DEvolutionSerieReguliere.java 4 Jul 2003 13:37:12 -0000 1.3
***************
*** 16,19 ****
--- 16,20 ----
import org.fudaa.dodico.objet.CDodico;
import org.fudaa.dodico.objet.DObjet;
+ import org.fudaa.dodico.usine.UsineHelper;
/**
***************
*** 47,51 ****
public DEvolutionSerieReguliere()
{
! instants_ = CDodico.findUsine().creePlanificationBoucleTemps();
serie_ = new double[0];
}
--- 48,52 ----
public DEvolutionSerieReguliere()
{
! instants_ = UsineHelper.findUsine().creePlanificationBoucleTemps();
serie_ = new double[0];
}
|
|
From: <de...@us...> - 2003-07-04 13:35:14
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mathematiques In directory sc8-pr-cvs1:/tmp/cvs-serv24291 Modified Files: DMathematiques.java DMatriceComplexe.java Log Message: maj import et UsineHelper ---------------------------------------------------------------------- Index: DMathematiques.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mathematiques/DMathematiques.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DMathematiques.java 18 Mar 2003 13:10:38 -0000 1.2 --- DMathematiques.java 4 Jul 2003 13:35:10 -0000 1.3 *************** *** 10,16 **** package org.fudaa.dodico.mathematiques; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.objet.*; ! import org.fudaa.dodico.corba.mathematiques.*; /** --- 10,15 ---- package org.fudaa.dodico.mathematiques; ! import org.fudaa.dodico.corba.mathematiques.IMathematiquesOperations; ! import org.fudaa.dodico.objet.DObjet; /** Index: DMatriceComplexe.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mathematiques/DMatriceComplexe.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DMatriceComplexe.java 18 Mar 2003 13:10:38 -0000 1.3 --- DMatriceComplexe.java 4 Jul 2003 13:35:11 -0000 1.4 *************** *** 10,17 **** package org.fudaa.dodico.mathematiques; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.objet.*; ! import org.fudaa.dodico.corba.mathematiques.*; ! import JSci.maths.*; /** --- 10,27 ---- package org.fudaa.dodico.mathematiques; ! import JSci.maths.Complex; ! import JSci.maths.ComplexMatrix; ! import JSci.maths.ComplexSquareMatrix; ! import JSci.maths.MatrixDimensionException; ! import JSci.maths.MatrixMath; ! ! import org.fudaa.dodico.corba.mathematiques.IMatriceComplexe; ! import org.fudaa.dodico.corba.mathematiques.IMatriceComplexeOperations; ! import org.fudaa.dodico.corba.mathematiques.IMatriceReel; ! import org.fudaa.dodico.corba.mathematiques.IMatriceReelHelper; ! import org.fudaa.dodico.corba.mathematiques.IVecteurComplexe; ! import org.fudaa.dodico.corba.mathematiques.SComplexe; ! import org.fudaa.dodico.corba.objet.IObjet; ! import org.fudaa.dodico.objet.CDodico; /** |
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/lido/conversion/hydro1d In directory sc8-pr-cvs1:/tmp/cvs-serv22586/conversion/hydro1d Modified Files: CConversionHydraulique1dResultatsGeneraux.java CConversionHydraulique1dTemps.java Log Message: import et UsineHelper Index: CConversionHydraulique1dResultatsGeneraux.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/lido/conversion/hydro1d/CConversionHydraulique1dResultatsGeneraux.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CConversionHydraulique1dResultatsGeneraux.java 11 Apr 2003 16:09:04 -0000 1.3 --- CConversionHydraulique1dResultatsGeneraux.java 4 Jul 2003 13:24:59 -0000 1.4 *************** *** 10,20 **** package org.fudaa.dodico.lido.conversion.hydro1d; ! import java.util.*; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.corba.geometrie.*; ! import org.fudaa.dodico.corba.hydraulique1d.*; ! import org.fudaa.dodico.corba.lido.*; ! import org.fudaa.dodico.corba.calcul.*; ! import org.fudaa.dodico.hydraulique1d.*; /** --- 10,20 ---- package org.fudaa.dodico.lido.conversion.hydro1d; ! import org.fudaa.dodico.corba.hydraulique1d.ICalculHydraulique1d; ! import org.fudaa.dodico.corba.hydraulique1d.IResultatsGeneraux; ! import org.fudaa.dodico.corba.lido.ICalculLido; ! import org.fudaa.dodico.corba.lido.IResultatsLido; ! import org.fudaa.dodico.corba.lido.SResultatsERN; ! import org.fudaa.dodico.corba.lido.SResultatsRSN; ! import org.fudaa.dodico.corba.objet.IConnexion; /** Index: CConversionHydraulique1dTemps.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/lido/conversion/hydro1d/CConversionHydraulique1dTemps.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CConversionHydraulique1dTemps.java 11 Apr 2003 16:09:04 -0000 1.3 --- CConversionHydraulique1dTemps.java 4 Jul 2003 13:24:59 -0000 1.4 *************** *** 10,20 **** package org.fudaa.dodico.lido.conversion.hydro1d; ! import java.util.*; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.corba.hydraulique1d.*; ! import org.fudaa.dodico.corba.lido.*; ! import org.fudaa.dodico.corba.calcul.*; ! import org.fudaa.dodico.objet.*; ! import org.fudaa.dodico.hydraulique1d.*; /** --- 10,20 ---- package org.fudaa.dodico.lido.conversion.hydro1d; ! import org.fudaa.dodico.corba.hydraulique1d.ICalculHydraulique1d; ! import org.fudaa.dodico.corba.hydraulique1d.IParametresTemporels; ! import org.fudaa.dodico.corba.hydraulique1d.LCritereArret; ! import org.fudaa.dodico.corba.lido.ICalculLido; ! import org.fudaa.dodico.corba.lido.IParametresLido; ! import org.fudaa.dodico.corba.lido.SParametresCAL; ! import org.fudaa.dodico.corba.objet.IConnexion; /** |
|
From: <de...@us...> - 2003-07-04 13:25:02
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/lido/conversion/lido In directory sc8-pr-cvs1:/tmp/cvs-serv22586/conversion/lido Modified Files: CConversionHydraulique1dCLM.java Log Message: import et UsineHelper Index: CConversionHydraulique1dCLM.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/lido/conversion/lido/CConversionHydraulique1dCLM.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CConversionHydraulique1dCLM.java 11 Apr 2003 16:09:05 -0000 1.3 --- CConversionHydraulique1dCLM.java 4 Jul 2003 13:24:59 -0000 1.4 *************** *** 10,21 **** package org.fudaa.dodico.lido.conversion.lido; ! import java.util.*; ! import org.fudaa.dodico.corba.hydraulique1d.*; ! import org.fudaa.dodico.corba.hydraulique1d.singularite.*; ! import org.fudaa.dodico.corba.hydraulique1d.loi.*; ! import org.fudaa.dodico.corba.lido.*; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.corba.calcul.*; ! import org.fudaa.dodico.hydraulique1d.*; import org.fudaa.dodico.lido.conversion.LidoResource; --- 10,31 ---- package org.fudaa.dodico.lido.conversion.lido; ! import java.util.Vector; ! ! import org.fudaa.dodico.corba.hydraulique1d.ICalculHydraulique1d; ! import org.fudaa.dodico.corba.hydraulique1d.IEtude1d; ! import org.fudaa.dodico.corba.hydraulique1d.ILoiHydraulique; ! import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiHydrogramme; ! import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiLimnigramme; ! import org.fudaa.dodico.corba.hydraulique1d.loi.ILoiTarage; ! import org.fudaa.dodico.corba.hydraulique1d.singularite.IApport; ! import org.fudaa.dodico.corba.hydraulique1d.singularite.IPerteCharge; ! import org.fudaa.dodico.corba.lido.ICalculLido; ! import org.fudaa.dodico.corba.lido.IParametresLido; ! import org.fudaa.dodico.corba.lido.SParametresApportLigneCLM; ! import org.fudaa.dodico.corba.lido.SParametresCLM; ! import org.fudaa.dodico.corba.lido.SParametresCondLimBlocCLM; ! import org.fudaa.dodico.corba.lido.SParametresCondLimPointLigneCLM; ! import org.fudaa.dodico.corba.lido.SParametresPerteLigneCLM; ! import org.fudaa.dodico.corba.objet.IConnexion; import org.fudaa.dodico.lido.conversion.LidoResource; |
|
From: <de...@us...> - 2003-07-04 13:22:57
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/interpolateur
In directory sc8-pr-cvs1:/tmp/cvs-serv22350
Modified Files:
DInterpolateurMaillage.java
Log Message:
maj des import et usineHelper ...
Index: DInterpolateurMaillage.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/interpolateur/DInterpolateurMaillage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DInterpolateurMaillage.java 11 Apr 2003 16:08:57 -0000 1.3
--- DInterpolateurMaillage.java 4 Jul 2003 13:22:53 -0000 1.4
***************
*** 12,15 ****
--- 12,16 ----
import org.fudaa.dodico.objet.DObjet;
import org.fudaa.dodico.objet.CDodico;
+ import org.fudaa.dodico.usine.UsineHelper;
import org.fudaa.dodico.corba.usine.IUsine;
import org.fudaa.dodico.geometrie.DBoite;
***************
*** 519,523 ****
zpt = (-ee - aa * xpt - bb * ypt) / dd;
! IPoint r=CDodico.findUsine().creeGeometriePoint();
r.coordonnees(new double[] {xpt, ypt, zpt});
return r;
--- 520,524 ----
zpt = (-ee - aa * xpt - bb * ypt) / dd;
! IPoint r=UsineHelper.findUsine().creeGeometriePoint();
r.coordonnees(new double[] {xpt, ypt, zpt});
return r;
|
|
From: <de...@us...> - 2003-07-04 13:19:14
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique In directory sc8-pr-cvs1:/tmp/cvs-serv21787 Modified Files: DConditionInitiale.java Log Message: maj des imports Index: DConditionInitiale.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique/DConditionInitiale.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DConditionInitiale.java 29 Jan 2003 12:14:17 -0000 1.1 --- DConditionInitiale.java 4 Jul 2003 13:19:11 -0000 1.2 *************** *** 10,18 **** package org.fudaa.dodico.hydraulique; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.objet.*; ! import org.fudaa.dodico.corba.collection.*; ! import org.fudaa.dodico.collection.*; ! import org.fudaa.dodico.corba.hydraulique.*; /** --- 10,18 ---- package org.fudaa.dodico.hydraulique; ! import org.fudaa.dodico.corba.collection.ITableau; ! import org.fudaa.dodico.corba.hydraulique.IConditionInitiale; ! import org.fudaa.dodico.corba.hydraulique.IConditionInitialeOperations; ! import org.fudaa.dodico.corba.hydraulique.LTypeCondition; ! import org.fudaa.dodico.corba.objet.IObjet; /** |
|
From: <de...@us...> - 2003-07-04 13:16:16
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa
In directory sc8-pr-cvs1:/tmp/cvs-serv21215
Modified Files:
DCalculHiswa.java HiswaTestParser.java
Log Message:
Maj des imports ...
Index: DCalculHiswa.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/DCalculHiswa.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DCalculHiswa.java 18 Mar 2003 12:43:36 -0000 1.3
--- DCalculHiswa.java 4 Jul 2003 13:16:13 -0000 1.4
***************
*** 15,18 ****
--- 15,19 ----
import org.fudaa.dodico.corba.objet.*;
import org.fudaa.dodico.objet.*;
+ import org.fudaa.dodico.usine.UsineHelper;
import org.fudaa.dodico.corba.calcul.*;
import org.fudaa.dodico.calcul.*;
***************
*** 64,68 ****
public ITransfertFichierASCII copieFichiers()
{
! ITransfertFichierASCII flux = CDodico.findUsine().creeObjetTransfertFichierASCII();
String path=cheminServeur();
flux.setCheminServeur(path);
--- 65,69 ----
public ITransfertFichierASCII copieFichiers()
{
! ITransfertFichierASCII flux = UsineHelper.findUsine().creeObjetTransfertFichierASCII();
String path=cheminServeur();
flux.setCheminServeur(path);
Index: HiswaTestParser.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/HiswaTestParser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HiswaTestParser.java 18 Mar 2003 12:43:36 -0000 1.3
--- HiswaTestParser.java 4 Jul 2003 13:16:13 -0000 1.4
***************
*** 10,24 ****
package org.fudaa.dodico.hiswa;
! import java.io.*;
! import java.util.*;
! import org.fudaa.dodico.objet.*;
! import org.fudaa.dodico.corba.objet.*;
! import org.fudaa.dodico.corba.usine.IUsine;
! import org.fudaa.dodico.calcul.*;
! import org.fudaa.dodico.corba.calcul.*;
! import org.fudaa.dodico.fortran.*;
! import org.fudaa.dodico.corba.hiswa.*;
! import org.fudaa.dodico.hiswa.parser.*;
/**
--- 10,27 ----
package org.fudaa.dodico.hiswa;
! import java.io.File;
! import java.io.FileWriter;
! import java.io.IOException;
! import org.fudaa.dodico.corba.hiswa.ICalculHiswa;
! import org.fudaa.dodico.corba.hiswa.ICalculHiswaHelper;
! import org.fudaa.dodico.corba.hiswa.IParametresHiswa;
! import org.fudaa.dodico.corba.hiswa.IResultatsHiswa;
! import org.fudaa.dodico.corba.hiswa.SParametresHIS;
! import org.fudaa.dodico.corba.hiswa.SParametresHiswaTable;
! import org.fudaa.dodico.corba.hiswa.SResultatsHiswaTable;
! import org.fudaa.dodico.corba.objet.IConnexion;
! import org.fudaa.dodico.hiswa.parser.ParseException;
! import org.fudaa.dodico.objet.ServeurPersonne;
/**
|
|
From: <de...@us...> - 2003-07-04 13:13:48
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type
In directory sc8-pr-cvs1:/tmp/cvs-serv20565/type
Added Files:
H2dBordType.java H2dClType.java H2dEnumType.java
H2dMethodeResolutionType.java H2dProjetType.java
H2dRefluxImpressionType.java H2dSchemaResolutionType.java
H2dVariableType.java
Log Message:
Ajout des types (enum ...)
--- NEW FILE: H2dBordType.java ---
/*
* @file H2dBordType.java
* @creation 26 juin 2003
* @modification $Date: 2003/07/04 13:13:45 $
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
*/
package org.fudaa.dodico.h2d.type;
import java.util.List;
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoPermanentList;
/**
* @author deniger
* @version $Id: H2dBordType.java,v 1.1 2003/07/04 13:13:45 deniger Exp $
*/
public class H2dBordType extends H2dEnumType
{
public static H2dBordType SOLIDE=new H2dBordType(1,DodicoLib.geti18n("Solide"));
public static H2dBordType LIQUIDE=new H2dBordType(2,DodicoLib.geti18n("Liquide"));
public static H2dBordType LIQUIDE_DEBIT_IMPOSE=new H2dBordType(3,DodicoLib.geti18n("Liquide débit imposé"));
public static H2dBordType LIQUIDE_ONDE_INCIDENCE=new H2dBordType(4,DodicoLib.geti18n("Liquide onde incidence"));
public static final List LIST = new DodicoPermanentList(DodicoLib.sort(new H2dBordType[] { SOLIDE,LIQUIDE,LIQUIDE_DEBIT_IMPOSE,LIQUIDE_ONDE_INCIDENCE }));
/**
*
*/
H2dBordType(int _id,String _nom)
{
super(_id,_nom);
}
public boolean equals(H2dBordType _t)
{
return _t==null?false:(id_==_t.id_);
}
public boolean equalsBord(H2dBordType _t)
{
return id_==_t.id_;
}
}
--- NEW FILE: H2dClType.java ---
/*
* @file H2dClType.java
* @creation 26 juin 2003
* @modification $Date: 2003/07/04 13:13:45 $
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
*/
package org.fudaa.dodico.h2d.type;
import org.fudaa.dodico.commun.DodicoLib;
/**
* @author deniger
* @version $Id: H2dClType.java,v 1.1 2003/07/04 13:13:45 deniger Exp $
*/
public class H2dClType extends H2dEnumType
{
public static H2dClType LIBRE=new H2dClType(1,DodicoLib.geti18n("Libre"));
public static H2dClType PERMANENT=new H2dClType(2,DodicoLib.geti18n("Permanent"));
public static H2dClType TRANSITOIRE=new H2dClType(3,DodicoLib.geti18n("Transitoire"));
/**
*
*/
H2dClType(int _id,String _nom)
{
super(_id,_nom);
}
}
--- NEW FILE: H2dEnumType.java ---
/*
* @file H2dEnumType.java
* @creation 26 juin 2003
* @modification $Date: 2003/07/04 13:13:45 $
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
*/
package org.fudaa.dodico.h2d.type;
/**
* @author deniger
* @version $Id: H2dEnumType.java,v 1.1 2003/07/04 13:13:45 deniger Exp $
*/
public class H2dEnumType implements Comparable
{
int id_;
String nom_;
/**
*
*/
H2dEnumType(int _id,String _nom)
{
id_=_id;
nom_=_nom;
}
public String getNom()
{
return nom_;
}
public String toString()
{
return nom_+" ("+id_+")";
}
public boolean equals(Object _o)
{
if (_o == this)
return true;
if (!(_o instanceof H2dEnumType))
{
return false;
}
return id_ == ((H2dEnumType) _o).id_;
}
/**
*
*/
public int compareTo(Object o)
{
if (o == this)
return 0;
if (o instanceof H2dEnumType)
{
return nom_.compareTo(((H2dEnumType) o).nom_);
}
else
throw new IllegalArgumentException("compareTo " + getClass().getName());
}
}
--- NEW FILE: H2dMethodeResolutionType.java ---
/*
* @file H2dMethodeResolution.java
* @creation 27 juin 2003
* @modification $Date: 2003/07/04 13:13:45 $
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
*/
package org.fudaa.dodico.h2d.type;
import java.util.Iterator;
import java.util.List;
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoPermanentList;
/**
* @author deniger
* @version $Id: H2dMethodeResolutionType.java,v 1.1 2003/07/04 13:13:45 deniger Exp $
*/
public class H2dMethodeResolutionType extends H2dEnumType
{
public static H2dMethodeResolutionType LINEAIRE=new H2dMethodeResolutionType(1,DodicoLib.geti18n("Linéaire"),"LINAIRE");
public static H2dMethodeResolutionType NEWTON_RAPHSON=new H2dMethodeResolutionType(2,DodicoLib.geti18n("Newton Raphson"),"NEWTON");
public static H2dMethodeResolutionType NEWTON_RAPHSON_BCD=new H2dMethodeResolutionType(3,DodicoLib.geti18n("Newton Raphson banc découvrant"),"NEWTON_BCD");
public static H2dMethodeResolutionType SELECT_LUMPING=new H2dMethodeResolutionType(4,DodicoLib.geti18n("Select Lumping"),"SELUMP");
public static H2dMethodeResolutionType SELECT_LUMPING_BCD=new H2dMethodeResolutionType(5,DodicoLib.geti18n("Select Lumping banc découvrant"),"SELUMP_BCD");
public static final List LIST =
new DodicoPermanentList(
DodicoLib.sort(
new H2dMethodeResolutionType[] { LINEAIRE,NEWTON_RAPHSON,NEWTON_RAPHSON_BCD,SELECT_LUMPING,SELECT_LUMPING_BCD }));
private String refluxId_;
/**
* @param _id
* @param _nom
*/
public H2dMethodeResolutionType(int _id, String _nom,String _refluxId)
{
super(_id, _nom);
refluxId_=_refluxId;
}
public static H2dMethodeResolutionType getTypeForRefluxId(String _id)
{
H2dMethodeResolutionType t;
for(Iterator it=LIST.iterator();it.hasNext();)
{
t=(H2dMethodeResolutionType)it.next();
if(t.refluxId_.equals(_id)) return t;
}
return null;
}
}
--- NEW FILE: H2dProjetType.java ---
/*
* @file H2dProjetType.java
* @creation 26 juin 2003
* @modification $Date: 2003/07/04 13:13:45 $
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
*/
package org.fudaa.dodico.h2d.type;
import java.util.Iterator;
import java.util.List;
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoPermanentList;
/**
* @author deniger
* @version $Id: H2dProjetType.java,v 1.1 2003/07/04 13:13:45 deniger Exp $
*/
public class H2dProjetType extends H2dEnumType
{
public static final H2dProjetType COURANTOLOGIE_2D =
new H2dProjetType(1, DodicoLib.geti18n("Courantologie 2D"), "VIT_NU_CON");
public static final H2dProjetType COURANTOLOGIE_2D_LMG =
new H2dProjetType(
2,
DodicoLib.geti18n("Courantologie 2D longueur mélange"),
"VIT_NU_LMG");
public static final H2dProjetType TRANSPORT =
new H2dProjetType(3, DodicoLib.geti18n("Transport"), "TEMPERATURE");
public static final List LIST =
new DodicoPermanentList(
DodicoLib.sort(
new H2dProjetType[] {
COURANTOLOGIE_2D,
COURANTOLOGIE_2D_LMG,
TRANSPORT }));
public static H2dProjetType getProjetFromRefluxId(String _s)
{
H2dProjetType t;
for (Iterator it = LIST.iterator(); it.hasNext();)
{
t = (H2dProjetType) it.next();
if (t.refluxId_.equals(_s))
return t;
}
return null;
}
private String refluxId_;
/**
* @param _id
* @param _nom
*/
public H2dProjetType(int _id, String _nom, String _refluxId)
{
super(_id, _nom);
refluxId_ = _refluxId;
}
}
--- NEW FILE: H2dRefluxImpressionType.java ---
/*
* @file H2dRefluxImpressionType.java
* @creation 26 juin 2003
* @modification $Date: 2003/07/04 13:13:45 $
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
*/
package org.fudaa.dodico.h2d.type;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoPermanentList;
/**
* @author deniger
* @version $Id: H2dRefluxImpressionType.java,v 1.1 2003/07/04 13:13:45 deniger Exp $
*/
public class H2dRefluxImpressionType extends H2dEnumType
{
public static final H2dRefluxImpressionType DONNEES =
new H2dRefluxImpressionType(1, "DONNEES");
public static final H2dRefluxImpressionType POINTEURS =
new H2dRefluxImpressionType(2, "POINTEURS");
public static final H2dRefluxImpressionType TABLES_ELEM =
new H2dRefluxImpressionType(3, "TABLES_ELEM");
public static final H2dRefluxImpressionType TABLES_GLOB =
new H2dRefluxImpressionType(4, "TABLES_GLOB");
public static final H2dRefluxImpressionType CIEL =
new H2dRefluxImpressionType(5, "CIEL");
public static final H2dRefluxImpressionType INITIALISATION =
new H2dRefluxImpressionType(6, "INITIALISATION");
public static final H2dRefluxImpressionType MISES_A_JOUR =
new H2dRefluxImpressionType(7, "MISES_A_JOUR");
public static final H2dRefluxImpressionType RESOLUTION =
new H2dRefluxImpressionType(8, "RESOLUTION");
public static final H2dRefluxImpressionType ITERATION =
new H2dRefluxImpressionType(9, "ITERATION");
public static final List LIST =
new DodicoPermanentList(
DodicoLib.sort(
new H2dRefluxImpressionType[] {
DONNEES,
POINTEURS,
TABLES_ELEM,
TABLES_GLOB,
CIEL,
INITIALISATION,
MISES_A_JOUR,
RESOLUTION,
ITERATION }));
public static H2dRefluxImpressionType getTypeForRefluxId(String _id)
{
H2dRefluxImpressionType t;
for(Iterator it=LIST.iterator();it.hasNext();)
{
t=(H2dRefluxImpressionType)it.next();
if(t.nom_.equals(_id)) return t;
}
return null;
}
/**
* @param _id
* @param _nom
*/
H2dRefluxImpressionType(int _id, String _nom)
{
super(_id, _nom);
}
}
--- NEW FILE: H2dSchemaResolutionType.java ---
/*
* @file H2dSchemaResolutionType.java
* @creation 27 juin 2003
* @modification $Date: 2003/07/04 13:13:45 $
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
*/
package org.fudaa.dodico.h2d.type;
import java.util.Iterator;
import java.util.List;
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoPermanentList;
/**
* @author deniger
* @version $Id: H2dSchemaResolutionType.java,v 1.1 2003/07/04 13:13:45 deniger Exp $
*/
public class H2dSchemaResolutionType extends H2dEnumType
{
public static H2dSchemaResolutionType STATIONNAIRE =
new H2dSchemaResolutionType(
1,
DodicoLib.geti18n("Stationnaire"),
"STATIONNAIRE",new H2dMethodeResolutionType[]{H2dMethodeResolutionType.SELECT_LUMPING,H2dMethodeResolutionType.SELECT_LUMPING_BCD,H2dMethodeResolutionType.NEWTON_RAPHSON,H2dMethodeResolutionType.NEWTON_RAPHSON_BCD,H2dMethodeResolutionType.LINEAIRE});
public static H2dSchemaResolutionType KAWAHARA =
new H2dSchemaResolutionType(2, DodicoLib.geti18n("Kawahara"), "SELUMP",new H2dMethodeResolutionType[]{H2dMethodeResolutionType.SELECT_LUMPING,H2dMethodeResolutionType.SELECT_LUMPING_BCD});
public static H2dSchemaResolutionType EULER =
new H2dSchemaResolutionType(2, DodicoLib.geti18n("Euler"), "EULER",new H2dMethodeResolutionType[]{H2dMethodeResolutionType.NEWTON_RAPHSON,H2dMethodeResolutionType.NEWTON_RAPHSON_BCD,H2dMethodeResolutionType.LINEAIRE});
public static final List LIST =
new DodicoPermanentList(
DodicoLib.sort(
new H2dSchemaResolutionType[] { STATIONNAIRE, KAWAHARA, EULER }));
public static H2dSchemaResolutionType getTypeForRefluxId(String _id)
{
H2dSchemaResolutionType t;
for(Iterator it=LIST.iterator();it.hasNext();)
{
t=(H2dSchemaResolutionType)it.next();
if(t.refluxId_.equals(_id)) return t;
}
return null;
}
String refluxId_;
DodicoPermanentList methodeList_;
/**
* @param _id
* @param _nom
*/
public H2dSchemaResolutionType(int _id, String _nom, String refluxId, H2dMethodeResolutionType[] _methode)
{
super(_id, _nom);
refluxId_ = refluxId;
methodeList_=new DodicoPermanentList(_methode);
}
public boolean isSupported(H2dMethodeResolutionType _methode)
{
return methodeList_.contains(_methode);
}
}
--- NEW FILE: H2dVariableType.java ---
/*
* @file H2dVariable.java
* @creation 25 juin 2003
* @modification $Date: 2003/07/04 13:13:45 $
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
*/
package org.fudaa.dodico.h2d.type;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.commun.DodicoPermanentList;
/**
* @author deniger
* @version $Id: H2dVariableType.java,v 1.1 2003/07/04 13:13:45 deniger Exp $
*/
public class H2dVariableType extends H2dEnumType
{
public static final H2dVariableType DEBIT =
new H2dVariableType(1, DodicoLib.geti18n("Débit"), "Q");
public static final H2dVariableType COTE_EAU =
new H2dVariableType(2, DodicoLib.geti18n("Côte eau"), "SL");
public static final H2dVariableType TRACEUR =
new H2dVariableType(5, DodicoLib.geti18n("Traceur"), "T");
public static final H2dVariableType VITESSE_U =
new H2dVariableType(3, DodicoLib.geti18n("Vitesse u"), "U");
public static final H2dVariableType VITESSE_V =
new H2dVariableType(4, DodicoLib.geti18n("Vitesse v"), "V");
public static final H2dVariableType RUGOSITE =
new H2dVariableType(4, DodicoLib.geti18n("Rugosité"), null);
public static final H2dVariableType VISCOSITE =
new H2dVariableType(4, DodicoLib.geti18n("Viscosité"), null);
public static final H2dVariableType PERTE_CHARGE =
new H2dVariableType(4, DodicoLib.geti18n("Perte de charge"), null);
public static final H2dVariableType ALPHA_LONGUEUR_MELANGE =
new H2dVariableType(4, DodicoLib.geti18n("Alpha longueur mélange"), null);
private static List LIST_TELEMAC =null;
private static List LIST_REFLUX =null;
public static List LIST_TELEMAC()
{
if(LIST_TELEMAC==null) LIST_TELEMAC = new DodicoPermanentList(DodicoLib.sort(new H2dVariableType[] { DEBIT, COTE_EAU, TRACEUR, VITESSE_U, VITESSE_V }));
return LIST_TELEMAC;
}
public static List LIST_REFLUX()
{
if(LIST_REFLUX==null) LIST_REFLUX = new DodicoPermanentList(DodicoLib.sort(new H2dVariableType[] { ALPHA_LONGUEUR_MELANGE,RUGOSITE,VISCOSITE,PERTE_CHARGE }));
return LIST_REFLUX;
}
private String telemacID_;
/**
*
*/
private H2dVariableType(int _id, String _nom, String _telemacID)
{
super(_id,_nom);
telemacID_ = _telemacID;
}
public String getTelemacID()
{
return telemacID_;
}
public boolean equals(H2dVariableType _o)
{
return equalsVariable(_o);
}
public boolean equalsVariable(H2dVariableType _o)
{
return _o==null?false:(_o.id_==id_);
}
public static H2dVariableType getVariableForTelemacId(String _s)
{
for (Iterator it = LIST_TELEMAC().iterator(); it.hasNext();)
{
H2dVariableType v = (H2dVariableType) it.next();
if (_s.equals(v.telemacID_))
return v;
}
return null;
}
public static void main(String[] args)
{
DodicoLib.printObject(LIST_TELEMAC(),true);
}
}
|
