[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/mesure DEvolutionComposee.java,1.2,1.3 DEvolutionConstante.java,1.2,1.3 DEvolutionModelisee.java,1.2,1.3 DEvolutionSerieIrreguliere.java,1.3,1.4 DEvolutionSerieReguliere.java,1.2,1.3

[<de...@us...>]

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];
    }