[Echempp-devel] Experiment/ExcitationFunction Makefile.am, 1.19, 1.20 excitationFunction.cpp, 1.6, 1.7 segment.cpp, 1.7, 1.8

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

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

Modified Files:
	Makefile.am excitationFunction.cpp segment.cpp 
Log Message:
Changed to use boost::serialization.


Index: excitationFunction.cpp
===================================================================
RCS file: /cvsroot/echempp/Experiment/ExcitationFunction/excitationFunction.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** excitationFunction.cpp	24 Nov 2005 11:35:19 -0000	1.6
--- excitationFunction.cpp	19 Dec 2007 13:27:51 -0000	1.7
***************
*** 40,46 ****
  namespace ExcitationFunctions
  {
- //! definition of ExcitationFunction tag
-    const std::string ExcitationFunction::TAG = "excitationFunction";
- 
  //! definition of Out_of_range exception default text
     const std::string Out_of_range::OUTOFRANGE 
--- 40,43 ----
***************
*** 50,57 ****
     const std::string Out_of_segments::OUTOFSEGMENTS 
                                   = "nonexisting segment requested!";
- 
- //! definition of LoadError exception default text
-    const std::string LoadError::LOADERROR 
-                           = "error during interpretation of XML file!";
  }
  
--- 47,50 ----

Index: segment.cpp
===================================================================
RCS file: /cvsroot/echempp/Experiment/ExcitationFunction/segment.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** segment.cpp	19 Dec 2006 13:05:46 -0000	1.7
--- segment.cpp	19 Dec 2007 13:27:51 -0000	1.8
***************
*** 38,66 ****
    namespace Segments
    {
!  //! definition of segment tag
!    const std::string Segment::TAG = "segment";
! 
!  //! definition of segment ID tag
!    const std::string Segment::IDTAG = "ID";
! 
!  //! definition of segment IMAXVALUE tag
!    const std::string Segment::IMAXVALUE = "ImaxValue";
! 
!  //! definition of segment IMAXUNIT tag
!    const std::string Segment::IMAXUNIT = "ImaxUnit";
! 
!  //! definition of Out_of_range exception default text
!    const std::string Out_of_range::OUTOFRANGE 
!                                  = "independent variable out of range!";
! 
!  //! definition of Power_error exception default text
!    const std::string Power_error::POWERERROR 
!                                      = "power in PowerSegment <= -1.0!";
  
!  //! definition of LoadError exception default text
     const std::string LoadError::LOADERROR 
                             = "error during interpretation of XML file!";
  
! } // end namespace Segments
  } // end namespace ExcitationFunctions
  
--- 38,55 ----
    namespace Segments
    {
!     //! definition of Out_of_range exception default text
!     const std::string Out_of_range::OUTOFRANGE 
!     = "independent variable out of range!";
!     
!     //! definition of Power_error exception default text
!     const std::string Power_error::POWERERROR 
!     = "power in PowerSegment <= -1.0!";
  
!     //! definition of LoadError exception default text
     const std::string LoadError::LOADERROR 
                             = "error during interpretation of XML file!";
  
!     const std::string Segment::GUID = "Segment";
!   } // end namespace Segments
  } // end namespace ExcitationFunctions
  

Index: Makefile.am
===================================================================
RCS file: /cvsroot/echempp/Experiment/ExcitationFunction/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Makefile.am	30 Nov 2006 12:35:18 -0000	1.19
--- Makefile.am	19 Dec 2007 13:27:51 -0000	1.20
***************
*** 18,22 ****
                                         -DTIXML_USE_STL=YES
  
! libeppExcitationFunction_la_LDFLAGS = $(EXPERIMENT_LDFLAGS) -version-info 0:5:0
  
  EXTRA_DIST = ecExcitationFunctions.hpp \
--- 18,22 ----
                                         -DTIXML_USE_STL=YES
  
! libeppExcitationFunction_la_LDFLAGS = -Wl,--allow-multiple-definition $(EXPERIMENT_LDFLAGS) -version-info 0:5:0
  
  EXTRA_DIST = ecExcitationFunctions.hpp \