echempp-devel Mailing List for EChem++ (Page 5)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/echempp/Experiment/Experiment
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv23798/Experiment/Experiment

Modified Files:
	Experiment.hpp 
Log Message:
Changed to deal with recent changes made in Quantities.


Index: Experiment.hpp
===================================================================
RCS file: /cvsroot/echempp/Experiment/Experiment/Experiment.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Experiment.hpp	27 Dec 2007 19:17:21 -0000	1.8
--- Experiment.hpp	9 Jan 2008 20:43:21 -0000	1.9
***************
*** 30,36 ****
  
  // BSUtilities includes
- //#include "SerializationTools.h"
  #include "TemplateTools.h"
- #include "TypeToName.h"
  
  // STL includes
--- 30,34 ----
***************
*** 63,77 ****
  {
  
-   template<class T>
-   const std::string type2name()
-   {
-     return T::create_guid();
-   }
-   template<>
-   inline const std::string type2name<Loki::EmptyType>()
-   {
-     return "EmptyType";
-   }
- 
    //! Unary functor for deletion.
    template<typename Obj>
--- 61,64 ----
***************
*** 94,120 ****
    {
      //! Type used to designate simulated experiments.
!     struct Simulated
!     {
!       static const std::string create_guid()
!       {
! 	return "Simulated";
!       }
!     };
      //! Type used to designate real experiments.
!     struct Real
!     {
!       static const std::string create_guid()
!       {
! 	return "Real";
!       }
!     };
      //! Type used to designate dual experiments, e.g. one part real the other simulated.
!     struct Dual
!     {
!       static const std::string create_guid()
!       {
! 	return "Dual";
!       }
!     };
    }
    //! Namespace for dynamics types.
--- 81,89 ----
    {
      //! Type used to designate simulated experiments.
!     struct Simulated {};
      //! Type used to designate real experiments.
!     struct Real {};
      //! Type used to designate dual experiments, e.g. one part real the other simulated.
!     struct Dual {};
    }
    //! Namespace for dynamics types.
***************
*** 122,140 ****
    {
      //! Type used to designate dynamic experiments.
!     struct Dynamic
!     {
!       static const std::string create_guid()
!       {
! 	return "Dynamic";
!       }
!     };
      //! Type used to designate static experiments.
!     struct Static
!     {
!       static const std::string create_guid()
!       {
! 	return "Static";
!       }
!     };
    }
  
--- 91,97 ----
    {
      //! Type used to designate dynamic experiments.
!     struct Dynamic {};
      //! Type used to designate static experiments.
!     struct Static {};
    }
  
***************
*** 305,317 ****
      typedef Action<Tech>
      _Action;
-     static const std::string create_guid()
-     {
-       // TODO Use Segment Type as well
-       return "Action_" + type2name<Realism>() + "_" 
- 	+ type2name<Dynamics>() + "_" + I::create_guid() + "_" 
- 	+ type2name<D>() + "_" + type2name<R>();
-     }
-     //   BSUtilities::Serialization::AutoRegistor<Action<Tech> > reg;
-     static const std::string GUID;
      Action() {}
      Action(const std::string title) : _AtomicBase(title) {}
--- 262,265 ----
***************
*** 414,426 ****
    };
  
-   template<class Realism,
-           class Dynamics,
-           class I,
-           class D,
-           class R,
-           template<class, class> class S>
-    const std::string Action<Technique<Realism,Dynamics,I,D,R,S> >::GUID =
-    Action<Technique<Realism,Dynamics,I,D,R,S> >::create_guid();
- 
    //! Class to represent induced experiments.
    //! Induced experiments influence the system like Action but
--- 362,365 ----
***************
*** 444,456 ****
      typedef Induced<Tech>
      _Induced;
-     static const std::string create_guid()
-     {
-       // TODO Use Segment Type as well
-       return "Induced_" + type2name<Realism>() + "_" 
- 	+ type2name<Dynamics>() + "_" + type2name<I>() + "_" 
- 	+ type2name<D>() + "_" + type2name<R>();
-     }
-     //BSUtilities::Serialization::AutoRegistor<Induced<Tech> > reg;
-     static const std::string GUID;
      Induced() { cond_data = NULL; meas_data = NULL; };
      Induced(ConditionData* cd, MeasurementData* md) 
--- 383,386 ----
***************
*** 565,577 ****
    };
  
-   template<class Realism,
- 	   class Dynamics,
- 	   class I,
- 	   class D,
- 	   class R,
- 	   template<class, class> class S>
-   const std::string Induced<Technique<Realism,Dynamics,I,D,R,S> >::GUID =
-   Induced<Technique<Realism,Dynamics,I,D,R,S> >::create_guid();  
- 
    //! Class to represent Observations.
    //! Dynamic Observations collect information about the
--- 495,498 ----
***************
*** 593,604 ****
    public:
      typedef Technique<Realism, dynamics::Dynamic, I, Loki::EmptyType, R, BSUtilities::EmptyTemplate_2> Tech;
-     static const std::string create_guid()
-     {
-       return "Observation_" + type2name<Realism>() + "_" 
- 	+ type2name<dynamics::Dynamic>() + "_" 
- 	+ type2name<I>() + "_" + type2name<R>();
-     }
-     //BSUtilities::Serialization::AutoRegistor<Observation<Tech> > reg;
-     static const std::string GUID;
      Observation() { cond_data = NULL; };
      typedef Observation<Tech>  _Observation;
--- 514,517 ----
***************
*** 699,712 ****
      I end_;
      ConditionData *cond_data;
-     // TODO: insert StateData?
    };
  
    template<class Realism,
- 	   class I,
- 	   class R>
-   const std::string Observation<Technique<Realism,dynamics::Dynamic,I,Loki::EmptyType,R,BSUtilities::EmptyTemplate_2> >::GUID =
-   Observation<Technique<Realism,dynamics::Dynamic,I,Loki::EmptyType,R,BSUtilities::EmptyTemplate_2> >::create_guid();  
- 
-   template<class Realism,
  	   class R>
    class Observation<Technique<Realism, dynamics::Static, Loki::EmptyType, 
--- 612,618 ----
***************
*** 721,731 ****
  			  Loki::EmptyType, R, BSUtilities::EmptyTemplate_2> 
      Tech;
-     static const std::string create_guid()
-     {
-       return "Observation_" + type2name<Realism>() + "_" 
- 	+ type2name<R>();
-     }
-     //BSUtilities::Serialization::AutoRegistor<Observation<Tech> > reg;
-     static const std::string GUID;
  
      typedef Observation<Tech> _Observation;
--- 627,630 ----
***************
*** 794,802 ****
    };
  
-   template<class Realism,
- 	   class R>
-   const std::string Observation<Technique<Realism,dynamics::Static,Loki::EmptyType,Loki::EmptyType,R,BSUtilities::EmptyTemplate_2> >::GUID =
-   Observation<Technique<Realism,dynamics::Static,Loki::EmptyType,Loki::EmptyType,R,BSUtilities::EmptyTemplate_2> >::create_guid();  
- 
    //! Base class for all composed experiments.
    //! \sa Collection
--- 693,696 ----
***************
*** 807,812 ****
    {
    public:
-     static const std::string GUID;
-     //BSUtilities::Serialization::AutoRegistor<Compound> reg;
      Compound() {}
      Compound(const Compound& c)
--- 701,704 ----
***************
*** 978,983 ****
      virtual ~Collection() {};
      // No restricton on add, just inherit the one from Compound
-     static const std::string GUID;
-     //BSUtilities::Serialization::AutoRegistor<Collection> reg;
    private:
      friend class boost::serialization::access;
--- 870,873 ----
***************
*** 1000,1005 ****
    {
    public:
-     static const std::string GUID;
-     //BSUtilities::Serialization::AutoRegistor<Homogeneous> reg;
      Homogeneous(){}
      virtual ~Homogeneous(){}
--- 890,893 ----
***************
*** 1050,1055 ****
    {
    public:
-     static const std::string GUID;
-     //BSUtilities::Serialization::AutoRegistor<Sequential> reg;
      virtual ~Sequential() {};
      void add(Experiment* e)
--- 938,941 ----
***************
*** 1081,1086 ****
    {
    public:
-     static const std::string GUID;
-     //BSUtilities::Serialization::AutoRegistor<Simultaneous> reg;
      virtual ~Simultaneous() {};
      void add(Experiment* e)
--- 967,970 ----

2003	Jan	Feb	Mar	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2004	Jan	Feb	Mar	Apr	May (6)	Jun (3)	Jul	Aug	Sep	Oct (6)	Nov (6)	Dec (1)
2005	Jan (3)	Feb (12)	Mar (4)	Apr	May	Jun (4)	Jul	Aug (9)	Sep (2)	Oct	Nov (5)	Dec (4)
2006	Jan (56)	Feb (2)	Mar	Apr (1)	May (29)	Jun (38)	Jul (3)	Aug (4)	Sep (5)	Oct (1)	Nov (33)	Dec (26)
2007	Jan	Feb (56)	Mar (68)	Apr (14)	May (25)	Jun	Jul	Aug	Sep	Oct	Nov	Dec (60)
2008	Jan (15)	Feb	Mar (59)	Apr (5)	May	Jun	Jul	Aug	Sep (1)	Oct	Nov	Dec
2009	Jan	Feb	Mar	Apr (17)	May (4)	Jun	Jul	Aug	Sep	Oct	Nov	Dec

echempp-devel Mailing List for EChem++ (Page 5)

echempp-devel — discussions of developer involved with EChem++