[Echempp-devel] Experiment/Experiment/test ExperimentTest.cpp, 1.1, 1.2
Status: Beta
Brought to you by:
berndspeiser
|
From: beeblbrox <bee...@us...> - 2007-04-06 17:18:21
|
Update of /cvsroot/echempp/Experiment/Experiment/test In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv19931/test Modified Files: ExperimentTest.cpp Log Message: Updated to reflect changes done in Experiment.hpp. Index: ExperimentTest.cpp =================================================================== RCS file: /cvsroot/echempp/Experiment/Experiment/test/ExperimentTest.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ExperimentTest.cpp 6 Apr 2007 10:13:39 -0000 1.1 --- ExperimentTest.cpp 6 Apr 2007 17:18:18 -0000 1.2 *************** *** 18,24 **** { Experiment *ep; ! ep = new experiment::MyAction(Dynamic,Real); delete ep; ! ep = new Observation(Dynamic,Real); delete ep; // ep = new Collection(); --- 18,24 ---- { Experiment *ep; ! ep = new MyAction(); delete ep; ! ep = new MyObservation(); delete ep; // ep = new Collection(); *************** *** 40,45 **** { // Action serialization ! experiment::MyAction *act; ! act = new experiment::MyAction(Dynamic, Real); std::ofstream ofs_txt("/tmp/action.txt"); --- 40,45 ---- { // Action serialization ! MyAction *act; ! act = new MyAction(); std::ofstream ofs_txt("/tmp/action.txt"); *************** *** 49,53 **** boost::archive::xml_oarchive oa_xml(ofs_xml); ! const experiment::MyAction a(Dynamic, Real); cep = act; // oa_txt << *cep; --- 49,53 ---- boost::archive::xml_oarchive oa_xml(ofs_xml); ! const MyAction a; cep = act; // oa_txt << *cep; *************** *** 61,67 **** // Homogeneous serialization Homogeneous hg; ! hg.add(new experiment::MyAction(Dynamic,Real)); ! hg.add(new Observation(Dynamic,Real)); ! hg.add(new experiment::MyAction(Dynamic,Real)); std::ofstream ofs_txt("/tmp/exp.txt"); --- 61,67 ---- // Homogeneous serialization Homogeneous hg; ! hg.add(new experiment::MyAction()); ! // hg.add(new Observation(Dynamic,Real)); ! hg.add(new experiment::MyAction()); std::ofstream ofs_txt("/tmp/exp.txt"); |