[Echempp-devel] Experiment/ExcitationFunction ecExcitationFunctions.hpp, 1.5, 1.6 ecSegments.hpp, 1
Status: Beta
Brought to you by:
berndspeiser
Menu
▾
▴
[Echempp-devel] Experiment/ExcitationFunction ecExcitationFunctions.hpp, 1.5, 1.6 ecSegments.hpp, 1.13, 1.14 excitationFunction.cpp, 1.7, 1.8 excitationFunction.hpp, 1.40, 1.41 segment.cpp, 1.8, 1.9 segment.hpp, 1.39, 1.40
Update of /cvsroot/echempp/Experiment/ExcitationFunction In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv13173/Experiment/ExcitationFunction Modified Files: ecExcitationFunctions.hpp ecSegments.hpp excitationFunction.cpp excitationFunction.hpp segment.cpp segment.hpp Log Message: Removed AutoRegistor. Index: segment.cpp =================================================================== RCS file: /cvsroot/echempp/Experiment/ExcitationFunction/segment.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** segment.cpp 19 Dec 2007 13:27:51 -0000 1.8 --- segment.cpp 27 Dec 2007 19:17:21 -0000 1.9 *************** *** 32,35 **** --- 32,38 ---- #define _segment_cpp + #include <boost/archive/xml_iarchive.hpp> + #include <boost/archive/xml_oarchive.hpp> + #include "ExcitationFunction/segment.hpp" Index: excitationFunction.cpp =================================================================== RCS file: /cvsroot/echempp/Experiment/ExcitationFunction/excitationFunction.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** excitationFunction.cpp 19 Dec 2007 13:27:51 -0000 1.7 --- excitationFunction.cpp 27 Dec 2007 19:17:21 -0000 1.8 *************** *** 31,34 **** --- 31,37 ---- #define _excitationFunction_cpp + #include <boost/archive/xml_iarchive.hpp> + #include <boost/archive/xml_oarchive.hpp> + #include "ExcitationFunction/excitationFunction.hpp" Index: ecExcitationFunctions.hpp =================================================================== RCS file: /cvsroot/echempp/Experiment/ExcitationFunction/ecExcitationFunctions.hpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ecExcitationFunctions.hpp 15 Sep 2005 09:59:47 -0000 1.5 --- ecExcitationFunctions.hpp 27 Dec 2007 19:17:21 -0000 1.6 *************** *** 146,148 **** --- 146,158 ---- } + BOOST_CLASS_EXPORT(ExcitationFunctions::EtExcitationFunction) + BOOST_CLASS_EXPORT(ExcitationFunctions::itExcitationFunction) + BOOST_CLASS_EXPORT(ExcitationFunctions::CVExcitationFunction) + BOOST_CLASS_EXPORT(ExcitationFunctions::CAExcitationFunction) + BOOST_CLASS_EXPORT(ExcitationFunctions::IMExcitationFunction) + BOOST_CLASS_EXPORT(ExcitationFunctions::PCExcitationFunction) + BOOST_CLASS_EXPORT(ExcitationFunctions::CCExcitationFunction) + BOOST_CLASS_EXPORT(ExcitationFunctions::ECExcitationFunction) + BOOST_CLASS_EXPORT(ExcitationFunctions::PECExcitationFunction) + #endif /* ECExcitationFunctions.hpp */ Index: segment.hpp =================================================================== RCS file: /cvsroot/echempp/Experiment/ExcitationFunction/segment.hpp,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** segment.hpp 22 Dec 2007 15:49:53 -0000 1.39 --- segment.hpp 27 Dec 2007 19:17:21 -0000 1.40 *************** *** 34,38 **** // BSUtilities includes #include "TemplateTools.h" ! #include "SerializationTools.h" // Local includes --- 34,38 ---- // BSUtilities includes #include "TemplateTools.h" ! //#include "SerializationTools.h" // Local includes *************** *** 145,150 **** } //! id needed by ExcitationFunction dialogs internally ! virtual const std::string id() const { return "Segment"; } ! BSUtilities::Serialization::AutoRegistor<Segment> reg; static const std::string GUID; private: --- 145,150 ---- } //! id needed by ExcitationFunction dialogs internally ! virtual const std::string id() const { return GUID; } ! //BSUtilities::Serialization::AutoRegistor<Segment> reg; static const std::string GUID; private: *************** *** 184,192 **** at a certain value of the independent variable */ ! // virtual D value (const I & independentValue) const = 0; ! virtual D value (const I & independentValue) const ! { ! return 0; ! } //! derivative function --- 184,192 ---- at a certain value of the independent variable */ ! virtual D value (const I & independentValue) const = 0; ! // virtual D value (const I & independentValue) const ! // { ! // return 0; ! // } //! derivative function *************** *** 194,204 **** dependent variable at a certain value of the independent variable */ - // virtual typename quantity::GenerateVariable<D,I>::Sub - // derivative( const I & independentValue) const = 0; virtual typename quantity::GenerateVariable<D,I>::Sub ! derivative( const I & independentValue) const ! { ! return 0; ! } //! give maximum value of independent variable for this segment. --- 194,204 ---- dependent variable at a certain value of the independent variable */ virtual typename quantity::GenerateVariable<D,I>::Sub ! derivative( const I & independentValue) const = 0; ! // virtual typename quantity::GenerateVariable<D,I>::Sub ! // derivative( const I & independentValue) const ! // { ! // return 0; ! // } //! give maximum value of independent variable for this segment. *************** *** 214,233 **** I maximum (void) const {return _Imax;} ! // virtual bool operator== (const DISegment<D, I> &) const = 0; ! virtual bool operator== (const DISegment<D, I> &) const ! { ! return false; ! } //! prototype pattern's pure virtual clone function. /*! All the segment subclasses clone themselves when calling that function. Take care to clean up your memory. */ ! // virtual DISegment<D,I>* clone (void) const = 0; ! virtual DISegment<D,I>* clone (void) const ! { ! return 0; ! } //! id needed by ExcitationFunction dialogs internally ! virtual const std::string id() const { return "DISegment"; } static const std::string create_guid() --- 214,233 ---- I maximum (void) const {return _Imax;} ! virtual bool operator== (const DISegment<D, I> &) const = 0; ! // virtual bool operator== (const DISegment<D, I> &) const ! // { ! // return false; ! // } //! prototype pattern's pure virtual clone function. /*! All the segment subclasses clone themselves when calling that function. Take care to clean up your memory. */ ! virtual DISegment<D,I>* clone (void) const = 0; ! // virtual DISegment<D,I>* clone (void) const ! // { ! // return 0; ! // } //! id needed by ExcitationFunction dialogs internally ! virtual const std::string id() const { return GUID; } static const std::string create_guid() *************** *** 235,239 **** return "Segment_" + D::create_guid() + "_" + I::create_guid(); } ! BSUtilities::Serialization::AutoRegistor<DISegment<D,I> > reg; static const std::string GUID; protected: --- 235,239 ---- return "Segment_" + D::create_guid() + "_" + I::create_guid(); } ! //BSUtilities::Serialization::AutoRegistor<DISegment<D,I> > reg; static const std::string GUID; protected: *************** *** 415,420 **** } //! id needed by ExcitationFunction dialogs internally ! const std::string id() const { return "Linear"; } ! BSUtilities::Serialization::AutoRegistor<LinearSegment<D,I> > reg; static const std::string GUID; private: --- 415,420 ---- } //! id needed by ExcitationFunction dialogs internally ! const std::string id() const { return GUID; } ! //BSUtilities::Serialization::AutoRegistor<LinearSegment<D,I> > reg; static const std::string GUID; private: *************** *** 569,577 **** static const std::string create_guid() { return "ConstantSegment_" + D::create_guid() + "_" + I::create_guid(); } //! id needed by ExcitationFunction dialogs internally ! const std::string id() const { return "Constant"; } ! BSUtilities::Serialization::AutoRegistor<ConstantSegment<D,I> > reg; static const std::string GUID; private: --- 569,578 ---- static const std::string create_guid() { + ConstantSegment<D,I> cs; return "ConstantSegment_" + D::create_guid() + "_" + I::create_guid(); } //! id needed by ExcitationFunction dialogs internally ! const std::string id() const { return GUID; } ! //BSUtilities::Serialization::AutoRegistor<ConstantSegment<D,I> > reg; static const std::string GUID; private: *************** *** 744,753 **** } //! id needed by ExcitationFunction dialogs internally ! const std::string id() const { return "Sine"; } static const std::string create_guid() { return "SineSegment_" + D::create_guid() + "_" + I::create_guid(); } ! BSUtilities::Serialization::AutoRegistor<SineSegment<D,I> > reg; static const std::string GUID; private: --- 745,754 ---- } //! id needed by ExcitationFunction dialogs internally ! const std::string id() const { return GUID; } static const std::string create_guid() { return "SineSegment_" + D::create_guid() + "_" + I::create_guid(); } ! //BSUtilities::Serialization::AutoRegistor<SineSegment<D,I> > reg; static const std::string GUID; private: *************** *** 937,946 **** catch (std::bad_cast) {return false;} } ! const std::string id() const { return "Power"; } static const std::string create_guid() { return "PowerSegment_" + D::create_guid() + "_" + I::create_guid(); } ! BSUtilities::Serialization::AutoRegistor<PowerSegment<D,I> > reg; static const std::string GUID; private: --- 938,947 ---- catch (std::bad_cast) {return false;} } ! const std::string id() const { return GUID; } static const std::string create_guid() { return "PowerSegment_" + D::create_guid() + "_" + I::create_guid(); } ! //BSUtilities::Serialization::AutoRegistor<PowerSegment<D,I> > reg; static const std::string GUID; private: *************** *** 1121,1130 **** catch (std::bad_cast) {return false;} } ! const std::string id() const { return "Exp"; } static const std::string create_guid() { return "ExponentialSegment_" + D::create_guid() + "_" + I::create_guid(); } ! BSUtilities::Serialization::AutoRegistor<ExponentialSegment<D,I> > reg; static const std::string GUID; private: --- 1122,1131 ---- catch (std::bad_cast) {return false;} } ! const std::string id() const { return GUID; } static const std::string create_guid() { return "ExponentialSegment_" + D::create_guid() + "_" + I::create_guid(); } ! //BSUtilities::Serialization::AutoRegistor<ExponentialSegment<D,I> > reg; static const std::string GUID; private: *************** *** 1324,1328 **** catch (std::bad_cast) {return false;} } ! const std::string id() const { return "PowerExp"; } static const std::string create_guid() { --- 1325,1329 ---- catch (std::bad_cast) {return false;} } ! const std::string id() const { return GUID; } static const std::string create_guid() { *************** *** 1330,1334 **** + "_" + I::create_guid() ; } ! BSUtilities::Serialization::AutoRegistor<PowerExponentialSegment<D,I> > reg; static const std::string GUID; private: --- 1331,1335 ---- + "_" + I::create_guid() ; } ! //BSUtilities::Serialization::AutoRegistor<PowerExponentialSegment<D,I> > reg; static const std::string GUID; private: *************** *** 1512,1521 **** */ DigitalSegment (void) {} ! const std::string id() const { return "Digital"; } static const std::string create_guid() { return "DigitalSegment_" + I::create_guid(); } ! BSUtilities::Serialization::AutoRegistor<DigitalSegment<I> > reg; static const std::string GUID; private: --- 1513,1522 ---- */ DigitalSegment (void) {} ! const std::string id() const { return GUID; } static const std::string create_guid() { return "DigitalSegment_" + I::create_guid(); } ! //BSUtilities::Serialization::AutoRegistor<DigitalSegment<I> > reg; static const std::string GUID; private: Index: excitationFunction.hpp =================================================================== RCS file: /cvsroot/echempp/Experiment/ExcitationFunction/excitationFunction.hpp,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** excitationFunction.hpp 19 Dec 2007 14:18:52 -0000 1.40 --- excitationFunction.hpp 27 Dec 2007 19:17:21 -0000 1.41 *************** *** 32,36 **** // BSUtilities includes ! #include "SerializationTools.h" // Local includes --- 32,36 ---- // BSUtilities includes ! //#include "SerializationTools.h" // Local includes *************** *** 226,230 **** return "ExcitationFunction_" + D::create_guid() + "_" + I::create_guid(); } ! BSUtilities::Serialization::AutoRegistor<DIExcitationFunction<D,I> > reg; static const std::string GUID; protected: --- 226,230 ---- return "ExcitationFunction_" + D::create_guid() + "_" + I::create_guid(); } ! //BSUtilities::Serialization::AutoRegistor<DIExcitationFunction<D,I> > reg; static const std::string GUID; protected: *************** *** 780,784 **** + I::create_guid() + "_" + S<D,I>::create_guid(); } ! BSUtilities::Serialization::AutoRegistor<SDIExcitationFunction<D,I,S> > reg; static const std::string GUID; private: --- 780,784 ---- + I::create_guid() + "_" + S<D,I>::create_guid(); } ! //BSUtilities::Serialization::AutoRegistor<SDIExcitationFunction<D,I,S> > reg; static const std::string GUID; private: Index: ecSegments.hpp =================================================================== RCS file: /cvsroot/echempp/Experiment/ExcitationFunction/ecSegments.hpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ecSegments.hpp 23 Nov 2006 09:15:54 -0000 1.13 --- ecSegments.hpp 27 Dec 2007 19:17:21 -0000 1.14 *************** *** 75,79 **** typedef ConstantSegment<quantity::ElectricPotential,quantity::Time> ConstantEtSegment; - template class ConstantSegment<quantity::ElectricPotential,quantity::Time>; --- 75,78 ---- *************** *** 175,177 **** --- 174,189 ---- } + BOOST_CLASS_EXPORT(ExcitationFunctions::Segments::EtSegment) + BOOST_CLASS_EXPORT(ExcitationFunctions::Segments::LinearEtSegment) + BOOST_CLASS_EXPORT(ExcitationFunctions::Segments::LinearitSegment) + BOOST_CLASS_EXPORT(ExcitationFunctions::Segments::ConstantEtSegment) + BOOST_CLASS_EXPORT(ExcitationFunctions::Segments::ConstantitSegment) + BOOST_CLASS_EXPORT(ExcitationFunctions::Segments::SineEtSegment) + BOOST_CLASS_EXPORT(ExcitationFunctions::Segments::SineitSegment) + BOOST_CLASS_EXPORT(ExcitationFunctions::Segments::PowerEtSegment) + BOOST_CLASS_EXPORT(ExcitationFunctions::Segments::PoweritSegment) + BOOST_CLASS_EXPORT(ExcitationFunctions::Segments::ExponentialEtSegment) + BOOST_CLASS_EXPORT(ExcitationFunctions::Segments::ExponentialitSegment) + BOOST_CLASS_EXPORT(ExcitationFunctions::Segments::PowerExponentialitSegment) + #endif /* ecSegments.hpp */ |
