[Echempp-devel] Experiment/Data Data.cpp, 1.2, 1.3 Data.hpp, 1.2, 1.3 Makefile.am, 1.12, 1.13

[beeblbrox <bee...@us...>]

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

Modified Files:
	Data.cpp Data.hpp Makefile.am 
Log Message:
Removed AutoRegistor.


Index: Data.cpp
===================================================================
RCS file: /cvsroot/echempp/Experiment/Data/Data.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Data.cpp	22 Dec 2007 15:47:38 -0000	1.2
--- Data.cpp	27 Dec 2007 19:17:20 -0000	1.3
***************
*** 1,2 ****
--- 1,5 ----
+ #include <boost/archive/xml_iarchive.hpp>
+ #include <boost/archive/xml_oarchive.hpp>
+ 
  #include "Data.hpp"
  

Index: Data.hpp
===================================================================
RCS file: /cvsroot/echempp/Experiment/Data/Data.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Data.hpp	22 Dec 2007 15:47:38 -0000	1.2
--- Data.hpp	27 Dec 2007 19:17:20 -0000	1.3
***************
*** 36,46 ****
  #include <algorithm>
  
- // BSUtilities includes
- #include "SerializationTools.h"
- 
- // local includes
- #include "ExcitationFunction/ecExcitationFunctions.hpp"
- #include "../../GUI/Windows/Qt/EChem++/Model/quantityTypes.hpp"
- 
  // Boost includes
  #include <boost/serialization/serialization.hpp>
--- 36,39 ----
***************
*** 49,52 ****
--- 42,49 ----
  #include <boost/serialization/base_object.hpp>
  
+ // local includes
+ #include "ExcitationFunction/ecExcitationFunctions.hpp"
+ #include "../../GUI/Windows/Qt/EChem++/Model/quantityTypes.hpp"
+ 
  namespace experiment{
  
***************
*** 114,119 ****
  {
  public:
-   BSUtilities::Serialization::AutoRegistor<MeasurementData> reg;
-   static const std::string GUID;
    //! Create a deep copy of MeasurementData
    virtual MeasurementData* clone() { return new MeasurementData(*this); }
--- 111,114 ----
***************
*** 133,138 ****
    //! Create a deep copy of MeasurementDataModSim
    MeasurementDataModSim* clone() { return new MeasurementDataModSim(*this); }
-   BSUtilities::Serialization::AutoRegistor<MeasurementDataModSim> reg;
-   static const std::string GUID;
    // TODO: Replace later by Measurement
    //! Response curve produced by simulator
--- 128,131 ----
***************
*** 160,165 ****
  {
  public:
-   BSUtilities::Serialization::AutoRegistor<ConditionData> reg;
-   static const std::string GUID;
    //! Create a deep copy of ConditionData.
    virtual ConditionData* clone() { return new ConditionData(*this); }
--- 153,156 ----
***************
*** 175,180 ****
  {
  public:
-   BSUtilities::Serialization::AutoRegistor<ModelPlotWidgetData> reg;
-   static const std::string GUID;
    std::vector<std::string> ids;
    std::string x_unit;
--- 166,169 ----
***************
*** 199,204 ****
  {
  public:
-   BSUtilities::Serialization::AutoRegistor<MechanismConditions> reg;
-   static const std::string GUID;
    bool chargeBalance;
    bool stoichiometricBalance;
--- 188,191 ----
***************
*** 221,226 ****
  {
  public:
-   BSUtilities::Serialization::AutoRegistor<ModelParameterConditions> reg;
-   static const std::string GUID;
    //! temperature
    quantity::ThermodynamicTemperature temp;  
--- 208,211 ----
***************
*** 352,357 ****
  {
  public:
-   BSUtilities::Serialization::AutoRegistor<SolverConditions> reg;
-   static const std::string GUID;
    enum Processor
      {
--- 337,340 ----
***************
*** 442,447 ****
    // Default copy ctor ok
    ConditionDataModSim* clone() { return new ConditionDataModSim(*this); }
-   BSUtilities::Serialization::AutoRegistor<ConditionDataModSim> reg;
-   static const std::string GUID;
    // data from experiment dialog
    double safety;
--- 425,428 ----
***************
*** 543,545 ****
--- 524,531 ----
  } // end namespace experiment
  
+ BOOST_CLASS_EXPORT(experiment::MeasurementData)
+ BOOST_CLASS_EXPORT(experiment::MeasurementDataModSim)
+ BOOST_CLASS_EXPORT(experiment::ConditionData)
+ BOOST_CLASS_EXPORT(experiment::ConditionDataModSim)
+ 
  #endif

Index: Makefile.am
===================================================================
RCS file: /cvsroot/echempp/Experiment/Data/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Makefile.am	22 Dec 2007 15:47:38 -0000	1.12
--- Makefile.am	27 Dec 2007 19:17:20 -0000	1.13
***************
*** 13,18 ****
  	-I$(BSUTILITIESSRC) 
  
! libeppData_la_SOURCES = Data.hpp \
! 			Data.cpp
  
  libeppData_la_CXXFLAGS = -Wall -Werror -pedantic-errors
--- 13,17 ----
  	-I$(BSUTILITIESSRC) 
  
! libeppData_la_SOURCES = Data.hpp
  
  libeppData_la_CXXFLAGS = -Wall -Werror -pedantic-errors