[Ecell-cvs] ecell3/ecell/libecs DifferentialStepper.cpp,1.22,1.23 Interpolant.cpp,1.2,1.3 Interpolant.hpp,1.2,1.3 Model.hpp,1.31,1.32 Stepper.cpp,1.146,1.147 Stepper.hpp,1.121,1.122 Variable.cpp,1.21,1.22 Variable.hpp,1.34,1.35

[Kouichi T. <sh...@us...>]

Update of /cvsroot/ecell/ecell3/ecell/libecs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9532/ecell/libecs

Modified Files:
	DifferentialStepper.cpp Interpolant.cpp Interpolant.hpp 
	Model.hpp Stepper.cpp Stepper.hpp Variable.cpp Variable.hpp 
Log Message:
more VariableProxy -> Interpolant renames

Index: Model.hpp
===================================================================
RCS file: /cvsroot/ecell/ecell3/ecell/libecs/Model.hpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** Model.hpp	17 Jun 2004 16:55:29 -0000	1.31
--- Model.hpp	24 Jun 2004 03:40:18 -0000	1.32
***************
*** 80,84 ****
         1. Initialize Systems recursively starting from theRootSystem.
            ( System::initialize() )
!        2. Check if all the Systems have a Stepper.
         3. Initialize Steppers. ( Stepper::initialize() )
         4. Construct Stepper interdependency graph 
--- 80,84 ----
         1. Initialize Systems recursively starting from theRootSystem.
            ( System::initialize() )
!        2. Check if all the Systems have a Stepper each.
         3. Initialize Steppers. ( Stepper::initialize() )
         4. Construct Stepper interdependency graph 

Index: Interpolant.cpp
===================================================================
RCS file: /cvsroot/ecell/ecell3/ecell/libecs/Interpolant.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Interpolant.cpp	17 Jun 2004 16:55:29 -0000	1.2
--- Interpolant.cpp	24 Jun 2004 03:40:18 -0000	1.3
***************
*** 41,45 ****
      theVariable( aVariable )
    {
!     //    theVariable->registerProxy( this );
    }
  
--- 41,45 ----
      theVariable( aVariable )
    {
!     //    theVariable->registerInterpolant( this );
    }
  
***************
*** 49,53 ****
      //    if( theVariable != NULLPTR )
      //      {
!     //	theVariable->removeProxy( this );
      //      }
    }
--- 49,53 ----
      //    if( theVariable != NULLPTR )
      //      {
!     //	theVariable->removeInterpolant( this );
      //      }
    }

Index: Stepper.cpp
===================================================================
RCS file: /cvsroot/ecell/ecell3/ecell/libecs/Stepper.cpp,v
retrieving revision 1.146
retrieving revision 1.147
diff -C2 -d -r1.146 -r1.147
*** Stepper.cpp	17 Jun 2004 16:55:30 -0000	1.146
--- Stepper.cpp	24 Jun 2004 03:40:18 -0000	1.147
***************
*** 100,104 ****
      
      //  Don't call
!     //    createVariableProxies();
      //  here:  only DifferentialSteppers need this.
    }
--- 100,104 ----
      
      //  Don't call
!     //    createInterpolants();
      //  here:  only DifferentialSteppers need this.
    }
***************
*** 246,257 ****
  
  
!   void Stepper::createVariableProxies()
    {
!     // create VariableProxies.
      for( VariableVector::size_type c( 0 );  
  	 c != theReadOnlyVariableOffset; ++c )
        {
  	VariablePtr aVariablePtr( theVariableVector[ c ] );
! 	aVariablePtr->registerProxy( createInterpolant( aVariablePtr ) );
        }
    }
--- 246,257 ----
  
  
!   void Stepper::createInterpolants()
    {
!     // create Interpolants.
      for( VariableVector::size_type c( 0 );  
  	 c != theReadOnlyVariableOffset; ++c )
        {
  	VariablePtr aVariablePtr( theVariableVector[ c ] );
! 	aVariablePtr->registerInterpolant( createInterpolant( aVariablePtr ) );
        }
    }

Index: Stepper.hpp
===================================================================
RCS file: /cvsroot/ecell/ecell3/ecell/libecs/Stepper.hpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -d -r1.121 -r1.122
*** Stepper.hpp	17 Jun 2004 16:55:30 -0000	1.121
--- Stepper.hpp	24 Jun 2004 03:40:19 -0000	1.122
***************
*** 580,584 ****
      */
  
!     void createVariableProxies();
  
      /**
--- 580,584 ----
      */
  
!     void createInterpolants();
  
      /**

Index: Interpolant.hpp
===================================================================
RCS file: /cvsroot/ecell/ecell3/ecell/libecs/Interpolant.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Interpolant.hpp	17 Jun 2004 16:55:29 -0000	1.2
--- Interpolant.hpp	24 Jun 2004 03:40:18 -0000	1.3
***************
*** 29,34 ****
  //
  
! #ifndef __VARIABLEPROXY_HPP
! #define __VARIABLEPROXY_HPP
  
  #include "libecs.hpp"
--- 29,34 ----
  //
  
! #ifndef __INTERPOLANT_HPP
! #define __INTERPOLANT_HPP
  
  #include "libecs.hpp"
***************
*** 112,116 ****
  
  
! #endif /* __VARIABLEPROXY_HPP */
  
  
--- 112,116 ----
  
  
! #endif /* __INTERPOLANT_HPP */
  
  

Index: DifferentialStepper.cpp
===================================================================
RCS file: /cvsroot/ecell/ecell3/ecell/libecs/DifferentialStepper.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** DifferentialStepper.cpp	17 Jun 2004 16:55:13 -0000	1.22
--- DifferentialStepper.cpp	24 Jun 2004 03:40:18 -0000	1.23
***************
*** 64,68 ****
      Stepper::initialize();
  
!     createVariableProxies();
  
      // size of the velocity buffer == the number of *write* variables.
--- 64,68 ----
      Stepper::initialize();
  
!     createInterpolants();
  
      // size of the velocity buffer == the number of *write* variables.

Index: Variable.cpp
===================================================================
RCS file: /cvsroot/ecell/ecell3/ecell/libecs/Variable.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Variable.cpp	17 Jun 2004 16:55:30 -0000	1.21
--- Variable.cpp	24 Jun 2004 03:40:19 -0000	1.22
***************
*** 95,104 ****
  
  
!   void Variable::registerProxy( InterpolantPtr const anInterpolantPtr )
    {
      theInterpolantVector.push_back( anInterpolantPtr );
    }
  
!   //  void Variable::removeProxy( InterpolantPtr const anInterpolantPtr )
    //  {
    //    theInterpolantVector.erase( std::remove( theInterpolantVector.begin(),
--- 95,104 ----
  
  
!   void Variable::registerInterpolant( InterpolantPtr const anInterpolantPtr )
    {
      theInterpolantVector.push_back( anInterpolantPtr );
    }
  
!   //  void Variable::removeInterpolant( InterpolantPtr const anInterpolantPtr )
    //  {
    //    theInterpolantVector.erase( std::remove( theInterpolantVector.begin(),

Index: Variable.hpp
===================================================================
RCS file: /cvsroot/ecell/ecell3/ecell/libecs/Variable.hpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** Variable.hpp	17 Jun 2004 16:55:30 -0000	1.34
--- Variable.hpp	24 Jun 2004 03:40:19 -0000	1.35
***************
*** 365,370 ****
      LOAD_METHOD( Real, NumberConc );
  
!     void registerProxy( InterpolantPtr const anInterpolant );
!     //    void removeProxy( InterpolantPtr const anInterpolant );
  
  
--- 365,370 ----
      LOAD_METHOD( Real, NumberConc );
  
!     void registerInterpolant( InterpolantPtr const anInterpolant );
!     //    void removeInterpolant( InterpolantPtr const anInterpolant );