Menu
▾
▴
[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/geometrie DPolygone.java,1.6,1.7 SPointVecteur.java,1.5,1.6 DGrilleIrreguliere.java,1.6,1.7 DPolyligne.java,1.6,1.7 DSphere.java,1.6,1.7 DGrilleReguliere.java,1.6,1.7 DSurfaceComposee.java,1.6,1.7 DBoite.java,1.7,1.8
|
From: Frederic D. <de...@us...> - 2004-04-30 07:19:24
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1703/src/org/fudaa/dodico/geometrie Modified Files: DPolygone.java SPointVecteur.java DGrilleIrreguliere.java DPolyligne.java DSphere.java DGrilleReguliere.java DSurfaceComposee.java DBoite.java Log Message: Changement des classes OLB en Olb Reintegration du package usine Index: SPointVecteur.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/SPointVecteur.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** SPointVecteur.java 25 Nov 2003 10:11:35 -0000 1.5 --- SPointVecteur.java 30 Apr 2004 07:18:40 -0000 1.6 *************** *** 10,13 **** --- 10,14 ---- import java.io.Serializable; import java.util.NoSuchElementException; + import org.fudaa.dodico.corba.geometrie.SPoint; /** Index: DPolyligne.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DPolyligne.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DPolyligne.java 27 Apr 2004 16:00:42 -0000 1.6 --- DPolyligne.java 30 Apr 2004 07:18:40 -0000 1.7 *************** *** 8,13 **** */ package org.fudaa.dodico.geometrie; - import org.fudaa.dodico.boony.BoonyLib; - import org.fudaa.dodico.corba.boony.IUsine; import org.fudaa.dodico.corba.collection.ITableau; import org.fudaa.dodico.corba.geometrie.IBoite; --- 8,11 ---- *************** *** 16,19 **** --- 14,19 ---- import org.fudaa.dodico.corba.geometrie.IPolyligne; import org.fudaa.dodico.corba.geometrie.IPolyligneOperations; + import org.fudaa.dodico.corba.usine.IUsine; + import org.fudaa.dodico.objet.UsineLib; /** * @version $Revision$ $Date$ by $Author$ *************** *** 29,33 **** */ public DPolyligne() { ! points_= BoonyLib.findUsine().creeCollectionTableau(); } /** --- 29,33 ---- */ public DPolyligne() { ! points_= UsineLib.findUsine().creeCollectionTableau(); } /** *************** *** 95,99 **** public void H4(double[][] _r) { points_.vide(); ! IUsine u= BoonyLib.findUsine(); for (int i= 0; i < _r.length; i++) { IPoint p= u.creeGeometriePoint(); --- 95,99 ---- public void H4(double[][] _r) { points_.vide(); ! IUsine u= UsineLib.findUsine(); for (int i= 0; i < _r.length; i++) { IPoint p= u.creeGeometriePoint(); *************** *** 123,127 **** if (points_.taille() > 0) { IPoint p0= point(0); ! r= BoonyLib.findUsine().creeGeometrieBoite(); r.pmin(p0); r.pmax(p0); --- 123,127 ---- if (points_.taille() > 0) { IPoint p0= point(0); ! r= UsineLib.findUsine().creeGeometrieBoite(); r.pmin(p0); r.pmax(p0); *************** *** 153,157 **** c[i] /= l * longueur; } ! r= BoonyLib.findUsine().creeGeometriePoint(); r.coordonnees(c); } --- 153,157 ---- c[i] /= l * longueur; } ! r= UsineLib.findUsine().creeGeometriePoint(); r.coordonnees(c); } *************** *** 176,180 **** c[i] /= (double)l; } ! r= BoonyLib.findUsine().creeGeometriePoint(); r.coordonnees(c); } --- 176,180 ---- c[i] /= (double)l; } ! r= UsineLib.findUsine().creeGeometriePoint(); r.coordonnees(c); } Index: DSphere.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DSphere.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DSphere.java 27 Apr 2004 16:00:42 -0000 1.6 --- DSphere.java 30 Apr 2004 07:18:40 -0000 1.7 *************** *** 8,17 **** */ package org.fudaa.dodico.geometrie; - import org.fudaa.dodico.boony.BoonyLib; - import org.fudaa.dodico.corba.boony.IUsine; import org.fudaa.dodico.corba.geometrie.IBoite; import org.fudaa.dodico.corba.geometrie.IPoint; import org.fudaa.dodico.corba.geometrie.ISphere; import org.fudaa.dodico.corba.geometrie.ISphereOperations; /** * Une classe definissant une sphere. --- 8,17 ---- */ package org.fudaa.dodico.geometrie; import org.fudaa.dodico.corba.geometrie.IBoite; import org.fudaa.dodico.corba.geometrie.IPoint; import org.fudaa.dodico.corba.geometrie.ISphere; import org.fudaa.dodico.corba.geometrie.ISphereOperations; + import org.fudaa.dodico.corba.usine.IUsine; + import org.fudaa.dodico.objet.UsineLib; /** * Une classe definissant une sphere. *************** *** 34,38 **** */ public DSphere() { ! centre_= BoonyLib.findUsine().creeGeometriePoint(); rayon_= 0.0; } --- 34,38 ---- */ public DSphere() { ! centre_= UsineLib.findUsine().creeGeometriePoint(); rayon_= 0.0; } *************** *** 95,99 **** // REM: faire une methode d'acces indicee a un IPoint double[] cen= centre_.coordonnees(); ! IUsine u= BoonyLib.findUsine(); IBoite boite= u.creeGeometrieBoite(); IPoint pmax= u.creeGeometriePoint(); --- 95,99 ---- // REM: faire une methode d'acces indicee a un IPoint double[] cen= centre_.coordonnees(); ! IUsine u= UsineLib.findUsine(); IBoite boite= u.creeGeometrieBoite(); IPoint pmax= u.creeGeometriePoint(); Index: DSurfaceComposee.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DSurfaceComposee.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DSurfaceComposee.java 27 Apr 2004 16:00:42 -0000 1.6 --- DSurfaceComposee.java 30 Apr 2004 07:18:40 -0000 1.7 *************** *** 8,13 **** */ package org.fudaa.dodico.geometrie; - import org.fudaa.dodico.boony.BoonyLib; - import org.fudaa.dodico.corba.boony.IUsine; import org.fudaa.dodico.corba.collection.ITableau; import org.fudaa.dodico.corba.geometrie.IPoint; --- 8,11 ---- *************** *** 17,20 **** --- 15,20 ---- import org.fudaa.dodico.corba.geometrie.ISurfaciqueHelper; import org.fudaa.dodico.corba.objet.IObjet; + import org.fudaa.dodico.corba.usine.IUsine; + import org.fudaa.dodico.objet.UsineLib; /** * @version $Id$ *************** *** 37,41 **** */ public DSurfaceComposee() { ! IUsine u= BoonyLib.findUsine(); positives_= u.creeCollectionTableau(); negatives_= u.creeCollectionTableau(); --- 37,41 ---- */ public DSurfaceComposee() { ! IUsine u= UsineLib.findUsine(); positives_= u.creeCollectionTableau(); negatives_= u.creeCollectionTableau(); Index: DBoite.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DBoite.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** DBoite.java 27 Apr 2004 16:34:27 -0000 1.7 --- DBoite.java 30 Apr 2004 07:18:40 -0000 1.8 *************** *** 8,13 **** */ package org.fudaa.dodico.geometrie; - import org.fudaa.dodico.boony.BoonyLib; - import org.fudaa.dodico.corba.boony.IUsine; import org.fudaa.dodico.corba.geometrie.IBoite; import org.fudaa.dodico.corba.geometrie.IBoiteHelper; --- 8,11 ---- *************** *** 16,21 **** --- 14,21 ---- import org.fudaa.dodico.corba.geometrie.ISpatialFini; import org.fudaa.dodico.corba.objet.IObjet; + import org.fudaa.dodico.corba.usine.IUsine; import org.fudaa.dodico.objet.CDodico; import org.fudaa.dodico.objet.DObjet; + import org.fudaa.dodico.objet.UsineLib; /** * @version $Revision$ $Date$ by $Author$ *************** *** 35,39 **** */ public DBoite() { ! IUsine u= BoonyLib.findUsine(); pmin_= u.creeGeometriePoint(); pmax_= u.creeGeometriePoint(); --- 35,39 ---- */ public DBoite() { ! IUsine u= UsineLib.findUsine(); pmin_= u.creeGeometriePoint(); pmax_= u.creeGeometriePoint(); *************** *** 122,126 **** c[i]= (cmin[i] + cmax[i]) / 2.; } ! IPoint r= BoonyLib.findUsine().creeGeometriePoint(); r.coordonnees(c); return r; --- 122,126 ---- c[i]= (cmin[i] + cmax[i]) / 2.; } ! IPoint r= UsineLib.findUsine().creeGeometriePoint(); r.coordonnees(c); return r; *************** *** 362,366 **** rcmax[i]= Math.min(bcmax[i], tcmax[i]); } ! IUsine u= BoonyLib.findUsine(); r= u.creeGeometrieBoite(); IPoint tempMax= u.creeGeometriePoint(); --- 362,366 ---- rcmax[i]= Math.min(bcmax[i], tcmax[i]); } ! IUsine u= UsineLib.findUsine(); r= u.creeGeometrieBoite(); IPoint tempMax= u.creeGeometriePoint(); *************** *** 406,410 **** rcmax[i]= Math.min(bcmax[i], tcmax[i]); } ! IUsine u= BoonyLib.findUsine(); r= u.creeGeometrieBoite(); IPoint tempMax= u.creeGeometriePoint(); --- 406,410 ---- rcmax[i]= Math.min(bcmax[i], tcmax[i]); } ! IUsine u= UsineLib.findUsine(); r= u.creeGeometrieBoite(); IPoint tempMax= u.creeGeometriePoint(); *************** *** 433,437 **** r= _b; } else { ! r= BoonyLib.findUsine().creeGeometrieBoite(); r.pmin(pmin_); r.pmax(pmax_); --- 433,437 ---- r= _b; } else { ! r= UsineLib.findUsine().creeGeometrieBoite(); r.pmin(pmin_); r.pmax(pmax_); *************** *** 454,458 **** r= _b; } else { ! r= BoonyLib.findUsine().creeGeometrieBoite(); r.pmin(pmin_); r.pmax(pmax_); --- 454,458 ---- r= _b; } else { ! r= UsineLib.findUsine().creeGeometrieBoite(); r.pmin(pmin_); r.pmax(pmax_); Index: DPolygone.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DPolygone.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DPolygone.java 27 Apr 2004 16:00:42 -0000 1.6 --- DPolygone.java 30 Apr 2004 07:18:40 -0000 1.7 *************** *** 8,12 **** */ package org.fudaa.dodico.geometrie; - import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.corba.geometrie.IBoite; import org.fudaa.dodico.corba.geometrie.IPoint; --- 8,11 ---- *************** *** 17,20 **** --- 16,20 ---- import org.fudaa.dodico.corba.objet.IObjet; import org.fudaa.dodico.objet.CDodico; + import org.fudaa.dodico.objet.UsineLib; /** * Une classe definissant un polygone *************** *** 32,36 **** */ public DPolygone() { ! sommets_= BoonyLib.findUsine().creeGeometriePolyligne(); } /** --- 32,36 ---- */ public DPolygone() { ! sommets_= UsineLib.findUsine().creeGeometriePolyligne(); } /** Index: DGrilleReguliere.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DGrilleReguliere.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DGrilleReguliere.java 27 Apr 2004 16:00:42 -0000 1.6 --- DGrilleReguliere.java 30 Apr 2004 07:18:40 -0000 1.7 *************** *** 8,18 **** */ package org.fudaa.dodico.geometrie; - import org.fudaa.dodico.boony.BoonyLib; - import org.fudaa.dodico.corba.boony.IUsine; import org.fudaa.dodico.corba.geometrie.IBoite; import org.fudaa.dodico.corba.geometrie.IGrilleReguliere; import org.fudaa.dodico.corba.geometrie.IGrilleReguliereOperations; import org.fudaa.dodico.corba.geometrie.IPoint; import org.fudaa.dodico.objet.CDodico; /** * @version $Revision$ $Date$ by $Author$ --- 8,18 ---- */ package org.fudaa.dodico.geometrie; import org.fudaa.dodico.corba.geometrie.IBoite; import org.fudaa.dodico.corba.geometrie.IGrilleReguliere; import org.fudaa.dodico.corba.geometrie.IGrilleReguliereOperations; import org.fudaa.dodico.corba.geometrie.IPoint; + import org.fudaa.dodico.corba.usine.IUsine; import org.fudaa.dodico.objet.CDodico; + import org.fudaa.dodico.objet.UsineLib; /** * @version $Revision$ $Date$ by $Author$ *************** *** 106,110 **** } } ! IUsine u= BoonyLib.findUsine(); IBoite boite= u.creeGeometrieBoite(); IPoint pmax= u.creeGeometriePoint(); --- 106,110 ---- } } ! IUsine u= UsineLib.findUsine(); IBoite boite= u.creeGeometrieBoite(); IPoint pmax= u.creeGeometriePoint(); *************** *** 131,135 **** } zmoy /= nbX_ * nbY_; ! IPoint r= BoonyLib.findUsine().creeGeometriePoint(); r.coordonnees( new double[] {(xmax_ - xmin_) / 2, (ymax_ - ymin_) / 2, zmoy }); --- 131,135 ---- } zmoy /= nbX_ * nbY_; ! IPoint r= UsineLib.findUsine().creeGeometriePoint(); r.coordonnees( new double[] {(xmax_ - xmin_) / 2, (ymax_ - ymin_) / 2, zmoy }); *************** *** 261,265 **** double ypas= (ymax_ - ymin_) / nbY_; IPoint[] pts= new IPoint[nbX_ * nbY_]; ! IUsine u= BoonyLib.findUsine(); for (int j= 0; j < nbX_; j++) { for (int i= 0; i < nbY_; i++) { --- 261,265 ---- double ypas= (ymax_ - ymin_) / nbY_; IPoint[] pts= new IPoint[nbX_ * nbY_]; ! IUsine u= UsineLib.findUsine(); for (int j= 0; j < nbX_; j++) { for (int i= 0; i < nbY_; i++) { Index: DGrilleIrreguliere.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DGrilleIrreguliere.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DGrilleIrreguliere.java 27 Apr 2004 16:00:42 -0000 1.6 --- DGrilleIrreguliere.java 30 Apr 2004 07:18:40 -0000 1.7 *************** *** 8,18 **** */ package org.fudaa.dodico.geometrie; - import org.fudaa.dodico.boony.BoonyLib; - import org.fudaa.dodico.corba.boony.IUsine; import org.fudaa.dodico.corba.geometrie.IBoite; import org.fudaa.dodico.corba.geometrie.IGrilleIrreguliere; import org.fudaa.dodico.corba.geometrie.IGrilleIrreguliereOperations; import org.fudaa.dodico.corba.geometrie.IPoint; import org.fudaa.dodico.objet.CDodico; /** * @version $Revision$ $Date$ by $Author$ --- 8,18 ---- */ package org.fudaa.dodico.geometrie; import org.fudaa.dodico.corba.geometrie.IBoite; import org.fudaa.dodico.corba.geometrie.IGrilleIrreguliere; import org.fudaa.dodico.corba.geometrie.IGrilleIrreguliereOperations; import org.fudaa.dodico.corba.geometrie.IPoint; + import org.fudaa.dodico.corba.usine.IUsine; import org.fudaa.dodico.objet.CDodico; + import org.fudaa.dodico.objet.UsineLib; /** * @version $Revision$ $Date$ by $Author$ *************** *** 49,53 **** } IGrilleIrreguliere r= ! BoonyLib.findUsine().creeGeometrieGrilleIrreguliere(); r.vvz(z_); r.vy(y_); --- 49,53 ---- } IGrilleIrreguliere r= ! UsineLib.findUsine().creeGeometrieGrilleIrreguliere(); r.vvz(z_); r.vy(y_); *************** *** 139,143 **** } } ! IUsine u= BoonyLib.findUsine(); IBoite boite= u.creeGeometrieBoite(); IPoint pmax= u.creeGeometriePoint(); --- 139,143 ---- } } ! IUsine u= UsineLib.findUsine(); IBoite boite= u.creeGeometrieBoite(); IPoint pmax= u.creeGeometriePoint(); *************** *** 174,178 **** ymoy /= x_.length * y_.length; zmoy /= x_.length * y_.length; ! IUsine u= BoonyLib.findUsine(); IPoint r= u.creeGeometriePoint(); r.coordonnees(new double[] { xmoy, ymoy, zmoy }); --- 174,178 ---- ymoy /= x_.length * y_.length; zmoy /= x_.length * y_.length; ! IUsine u= UsineLib.findUsine(); IPoint r= u.creeGeometriePoint(); r.coordonnees(new double[] { xmoy, ymoy, zmoy }); *************** *** 318,322 **** public IPoint[] points() { IPoint[] pts= new IPoint[x_.length * y_.length]; ! IUsine u= BoonyLib.findUsine(); for (int j= 0; j < x_.length; j++) { for (int i= 0; i < y_.length; i++) { --- 318,322 ---- public IPoint[] points() { IPoint[] pts= new IPoint[x_.length * y_.length]; ! IUsine u= UsineLib.findUsine(); for (int j= 0; j < x_.length; j++) { for (int i= 0; i < y_.length; i++) { |
