echempp-devel Mailing List for EChem++ (Page 7)
Status: Beta
Brought to you by:
berndspeiser
You can subscribe to this list here.
| 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
|
|
From: beeblbrox <bee...@us...> - 2007-12-19 13:21:07
|
Update of /cvsroot/echempp/Analysis/Classification In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv29098/Analysis/Classification Modified Files: Makefile.am Added Files: svm.cpp svm.h Log Message: svm add-on Index: Makefile.am =================================================================== RCS file: /cvsroot/echempp/Analysis/Classification/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.am 5 Mar 2007 19:49:50 -0000 1.5 --- Makefile.am 19 Dec 2007 13:21:03 -0000 1.6 *************** *** 9,16 **** result.cpp \ result.h \ ! tool.h #libeppClassification_la_CXXFLAGS = ! libeppClassification_la_LDFLAGS = $(ANALYSIS_LDFLAGS) -version-info 0:0:0 doc: --- 9,18 ---- result.cpp \ result.h \ ! tool.h \ ! svm.cpp \ ! svm.h #libeppClassification_la_CXXFLAGS = ! libeppClassification_la_LDFLAGS = -lm $(ANALYSIS_LDFLAGS) -version-info 0:0:0 doc: --- NEW FILE: svm.cpp --- #include <math.h> #include <stdio.h> #include <stdlib.h> #include <ctype.h> #include <float.h> #include <string.h> #include <stdarg.h> #include "svm.h" typedef float Qfloat; typedef signed char schar; #ifndef min template <class T> inline T min(T x,T y) { return (x<y)?x:y; } #endif #ifndef max template <class T> inline T max(T x,T y) { return (x>y)?x:y; } #endif template <class T> inline void swap(T& x, T& y) { T t=x; x=y; y=t; } template <class S, class T> inline void clone(T*& dst, S* src, int n) { [...3012 lines suppressed...] free(label); free(count); return "specified nu is infeasible"; } } } free(label); free(count); } return NULL; } int svm_check_probability_model(const svm_model *model) { return ((model->param.svm_type == C_SVC || model->param.svm_type == NU_SVC) && model->probA!=NULL && model->probB!=NULL) || ((model->param.svm_type == EPSILON_SVR || model->param.svm_type == NU_SVR) && model->probA!=NULL); } --- NEW FILE: svm.h --- #ifndef _LIBSVM_H #define _LIBSVM_H #ifdef __cplusplus extern "C" { #endif struct svm_node { int index; double value; }; struct svm_problem { int l; double *y; struct svm_node **x; }; enum { C_SVC, NU_SVC, ONE_CLASS, EPSILON_SVR, NU_SVR }; /* svm_type */ enum { LINEAR, POLY, RBF, SIGMOID, PRECOMPUTED }; /* kernel_type */ struct svm_parameter { int svm_type; int kernel_type; int degree; /* for poly */ double gamma; /* for poly/rbf/sigmoid */ double coef0; /* for poly/sigmoid */ /* these are for training only */ double cache_size; /* in MB */ double eps; /* stopping criteria */ double C; /* for C_SVC, EPSILON_SVR and NU_SVR */ int nr_weight; /* for C_SVC */ int *weight_label; /* for C_SVC */ double* weight; /* for C_SVC */ double nu; /* for NU_SVC, ONE_CLASS, and NU_SVR */ double p; /* for EPSILON_SVR */ int shrinking; /* use the shrinking heuristics */ int probability; /* do probability estimates */ }; // // svm_model // struct svm_model { svm_parameter param; // parameter int nr_class; // number of classes, = 2 in regression/one class svm int l; // total #SV svm_node **SV; // SVs (SV[l]) double **sv_coef; // coefficients for SVs in decision functions (sv_coef[n-1][l]) double *rho; // constants in decision functions (rho[n*(n-1)/2]) double *probA; // pariwise probability information double *probB; // for classification only int *label; // label of each class (label[n]) int *nSV; // number of SVs for each class (nSV[n]) // nSV[0] + nSV[1] + ... + nSV[n-1] = l // XXX int free_sv; // 1 if svm_model is created by svm_load_model // 0 if svm_model is created by svm_train }; struct svm_model *svm_train(const struct svm_problem *prob, const struct svm_parameter *param); void svm_cross_validation(const struct svm_problem *prob, const struct svm_parameter *param, int nr_fold, double *target); int svm_save_model(const char *model_file_name, const struct svm_model *model); struct svm_model *svm_load_model(const char *model_file_name); int svm_get_svm_type(const struct svm_model *model); int svm_get_nr_class(const struct svm_model *model); void svm_get_labels(const struct svm_model *model, int *label); double svm_get_svr_probability(const struct svm_model *model); void svm_predict_values(const struct svm_model *model, const struct svm_node *x, double* dec_values); double svm_predict(const struct svm_model *model, const struct svm_node *x); double svm_predict_probability(const struct svm_model *model, const struct svm_node *x, double* prob_estimates); void svm_destroy_model(struct svm_model *model); void svm_destroy_param(struct svm_parameter *param); const char *svm_check_parameter(const struct svm_problem *prob, const struct svm_parameter *param); int svm_check_probability_model(const struct svm_model *model); #ifdef __cplusplus } #endif #endif /* _LIBSVM_H */ |
Update of /cvsroot/echempp/GUI/Windows/Qt/EChem++/Experiment In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv25283 Modified Files: caExcitationFunctionDialog.cpp cvExcitationFunctionDialog.cpp userDefinedEtExcitationFunctionDialog.cpp userDefinedItExcitationFunctionDialog.cpp Log Message: Changes due to boost::serialization. Index: cvExcitationFunctionDialog.cpp =================================================================== RCS file: /cvsroot/echempp/GUI/Windows/Qt/EChem++/Experiment/cvExcitationFunctionDialog.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** cvExcitationFunctionDialog.cpp 26 Mar 2007 17:05:32 -0000 1.25 --- cvExcitationFunctionDialog.cpp 19 Dec 2007 13:11:34 -0000 1.26 *************** *** 262,269 **** } ! catch( ExcitationFunctions::LoadError& error ) ! { ! QMessageBox::warning( this, "Load button", error.message().c_str() ); ! } catch( const ExperimentError& error ) { --- 262,269 ---- } ! // catch( ExcitationFunctions::LoadError& error ) ! // { ! // QMessageBox::warning( this, "Load button", error.message().c_str() ); ! // } catch( const ExperimentError& error ) { *************** *** 1038,1042 **** EtExcitationFunction temp; ! BSUtilities::xmlr::xmlLoad (fileName.ascii(), temp); _EtFunction = temp; --- 1038,1042 ---- EtExcitationFunction temp; ! // BSUtilities::xmlr::xmlLoad (fileName.ascii(), temp); _EtFunction = temp; *************** *** 1058,1065 **** } ! catch( ExcitationFunctions::LoadError& error ) ! { ! QMessageBox::warning( this, "Load button", error.message().c_str() ); ! } catch( const ExperimentError& error ) { --- 1058,1065 ---- } ! // catch( ExcitationFunctions::LoadError& error ) ! // { ! // QMessageBox::warning( this, "Load button", error.message().c_str() ); ! // } catch( const ExperimentError& error ) { *************** *** 1085,1089 **** fileName.append(".xml"); } ! BSUtilities::xmlw::save(fileName.ascii(), _EtFunction); } --- 1085,1089 ---- fileName.append(".xml"); } ! // BSUtilities::xmlw::save(fileName.ascii(), _EtFunction); } Index: userDefinedItExcitationFunctionDialog.cpp =================================================================== RCS file: /cvsroot/echempp/GUI/Windows/Qt/EChem++/Experiment/userDefinedItExcitationFunctionDialog.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** userDefinedItExcitationFunctionDialog.cpp 26 Mar 2007 17:05:32 -0000 1.3 --- userDefinedItExcitationFunctionDialog.cpp 19 Dec 2007 13:11:34 -0000 1.4 *************** *** 327,331 **** for(;i<_itFunction.size();++i) { ! id = _itFunction.segment(i)->id(); if( id == "Constant" ) --- 327,333 ---- for(;i<_itFunction.size();++i) { ! // id = _itFunction.segment(i)->id(); ! // TODO FIXME ! id = ""; if( id == "Constant" ) *************** *** 374,381 **** } ! catch( ExcitationFunctions::LoadError& error ) ! { ! QMessageBox::warning( this, "Load button", error.message().c_str() ); ! } catch( const ExperimentError& error ) { --- 376,383 ---- } ! // catch( ExcitationFunctions::LoadError& error ) ! // { ! // QMessageBox::warning( this, "Load button", error.message().c_str() ); ! // } catch( const ExperimentError& error ) { *************** *** 1430,1434 **** { itExcitationFunction temp; ! BSUtilities::xmlr::xmlLoad(fileName.ascii(), temp); std::vector<int> efType; --- 1432,1436 ---- { itExcitationFunction temp; ! // BSUtilities::xmlr::xmlLoad(fileName.ascii(), temp); std::vector<int> efType; *************** *** 1438,1442 **** for(;i<temp.size();++i) { ! id = temp.segment(i)->id(); if( id == "Constant" ) --- 1440,1446 ---- for(;i<temp.size();++i) { ! // id = temp.segment(i)->id(); ! // TODO FIXME ! id = ""; if( id == "Constant" ) *************** *** 1493,1500 **** } ! catch( ExcitationFunctions::LoadError& error ) ! { ! QMessageBox::warning( this, "Load button", error.message().c_str() ); ! } catch( const ExperimentError& error ) { --- 1497,1504 ---- } ! // catch( ExcitationFunctions::LoadError& error ) ! // { ! // QMessageBox::warning( this, "Load button", error.message().c_str() ); ! // } catch( const ExperimentError& error ) { *************** *** 1521,1525 **** fileName.append(".xml"); } ! BSUtilities::xmlw::save(fileName.ascii(), _itFunction); } --- 1525,1529 ---- fileName.append(".xml"); } ! // BSUtilities::xmlw::save(fileName.ascii(), _itFunction); } Index: caExcitationFunctionDialog.cpp =================================================================== RCS file: /cvsroot/echempp/GUI/Windows/Qt/EChem++/Experiment/caExcitationFunctionDialog.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** caExcitationFunctionDialog.cpp 26 Mar 2007 17:05:32 -0000 1.19 --- caExcitationFunctionDialog.cpp 19 Dec 2007 13:11:34 -0000 1.20 *************** *** 233,240 **** } ! catch( ExcitationFunctions::LoadError& error ) ! { ! QMessageBox::warning( this, "Load button", error.message().c_str() ); ! } catch( const ExperimentError& error ) { --- 233,240 ---- } ! // catch( ExcitationFunctions::LoadError& error ) ! // { ! // QMessageBox::warning( this, "Load button", error.message().c_str() ); ! // } catch( const ExperimentError& error ) { *************** *** 972,976 **** EtExcitationFunction temp; ! BSUtilities::xmlr::xmlLoad (fileName.ascii(), temp); _EtFunction = temp; --- 972,976 ---- EtExcitationFunction temp; ! // BSUtilities::xmlr::xmlLoad (fileName.ascii(), temp); _EtFunction = temp; *************** *** 992,999 **** } ! catch( ExcitationFunctions::LoadError& error ) ! { ! QMessageBox::warning( this, "Load button", error.message().c_str() ); ! } catch( const ExperimentError& error ) { --- 992,999 ---- } ! // catch( ExcitationFunctions::LoadError& error ) ! // { ! // QMessageBox::warning( this, "Load button", error.message().c_str() ); ! // } catch( const ExperimentError& error ) { *************** *** 1019,1023 **** fileName.append(".xml"); } ! BSUtilities::xmlw::save(fileName.ascii(), _EtFunction); } --- 1019,1023 ---- fileName.append(".xml"); } ! // BSUtilities::xmlw::save(fileName.ascii(), _EtFunction); } Index: userDefinedEtExcitationFunctionDialog.cpp =================================================================== RCS file: /cvsroot/echempp/GUI/Windows/Qt/EChem++/Experiment/userDefinedEtExcitationFunctionDialog.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** userDefinedEtExcitationFunctionDialog.cpp 26 Mar 2007 17:05:32 -0000 1.3 --- userDefinedEtExcitationFunctionDialog.cpp 19 Dec 2007 13:11:34 -0000 1.4 *************** *** 305,309 **** for(;i<_EtFunction.size();++i) { ! id = _EtFunction.segment(i)->id(); if( id == "Constant" ) --- 305,311 ---- for(;i<_EtFunction.size();++i) { ! // id = _EtFunction.segment(i)->id(); ! // TODO FIXME ! id = ""; if( id == "Constant" ) *************** *** 343,350 **** } ! catch( ExcitationFunctions::LoadError& error ) ! { ! QMessageBox::warning( this, "Load button", error.message().c_str() ); ! } catch( const ExperimentError& error ) { --- 345,352 ---- } ! // catch( ExcitationFunctions::LoadError& error ) ! // { ! // QMessageBox::warning( this, "Load button", error.message().c_str() ); ! // } catch( const ExperimentError& error ) { *************** *** 1360,1364 **** { EtExcitationFunction temp; ! BSUtilities::xmlr::xmlLoad (fileName.ascii(), temp); std::vector<int> efType; --- 1362,1366 ---- { EtExcitationFunction temp; ! // BSUtilities::xmlr::xmlLoad (fileName.ascii(), temp); std::vector<int> efType; *************** *** 1368,1372 **** for(;i<temp.size();++i) { ! id = temp.segment(i)->id(); if( id == "Constant" ) --- 1370,1376 ---- for(;i<temp.size();++i) { ! // id = temp.segment(i)->id(); ! // TODO FIXME ! id = ""; if( id == "Constant" ) *************** *** 1415,1422 **** } ! catch( ExcitationFunctions::LoadError& error ) ! { ! QMessageBox::warning( this, "Load button", error.message().c_str() ); ! } catch( const ExperimentError& error ) { --- 1419,1426 ---- } ! // catch( ExcitationFunctions::LoadError& error ) ! // { ! // QMessageBox::warning( this, "Load button", error.message().c_str() ); ! // } catch( const ExperimentError& error ) { *************** *** 1443,1447 **** fileName.append(".xml"); } ! BSUtilities::xmlw::save(fileName.ascii(), _EtFunction); } --- 1447,1451 ---- fileName.append(".xml"); } ! // BSUtilities::xmlw::save(fileName.ascii(), _EtFunction); } |
|
From: beeblbrox <bee...@us...> - 2007-12-19 11:51:27
|
Update of /cvsroot/echempp/GUI/Windows/Qt/EChem++/Model In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv25484 Modified Files: Makefile.am Log Message: Extended to include batchExperimentDialog and SVM related dialogs. Index: Makefile.am =================================================================== RCS file: /cvsroot/echempp/GUI/Windows/Qt/EChem++/Model/Makefile.am,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** Makefile.am 11 May 2007 14:50:50 -0000 1.42 --- Makefile.am 19 Dec 2007 11:51:20 -0000 1.43 *************** *** 19,22 **** --- 19,24 ---- helpWindowBase.ui \ solverDialogBase.ui \ + svmParametersDialogBase.ui \ + batchExperimentDialogBase.ui \ textPropertiesBase.ui *************** *** 81,85 **** .ui/userDefinedEtExcitationFunctionDialogBase.cpp \ .ui/userDefinedItExcitationFunctionDialogBase.h \ ! .ui/userDefinedItExcitationFunctionDialogBase.cpp .ui/helpWindowBase.h: helpWindowBase.ui --- 83,93 ---- .ui/userDefinedEtExcitationFunctionDialogBase.cpp \ .ui/userDefinedItExcitationFunctionDialogBase.h \ ! .ui/userDefinedItExcitationFunctionDialogBase.cpp \ ! .ui/svmParametersDialogBase.h \ ! .ui/svmParametersDialogBase.cpp \ ! .ui/svmDataDialogBase.h \ ! .ui/svmDataDialogBase.cpp \ ! .ui/batchExperimentDialogBase.h \ ! .ui/batchExperimentDialogBase.cpp .ui/helpWindowBase.h: helpWindowBase.ui *************** *** 123,126 **** --- 131,140 ---- .ui/userDefinedItExcitationFunctionDialogBase.h: ../Experiment/userDefinedItExcitationFunctionDialogBase.ui .ui/userDefinedItExcitationFunctionDialogBase.cpp: ../Experiment/userDefinedItExcitationFunctionDialogBase.ui .ui/userDefinedItExcitationFunctionDialogBase.h + .ui/svmParametersDialogBase.h: svmParametersDialogBase.ui + .ui/svmParametersDialogBase.cpp: svmParametersDialogBase.ui .ui/svmParametersDialogBase.h + .ui/svmDataDialogBase.h: svmDataDialogBase.ui + .ui/svmDataDialogBase.cpp: svmDataDialogBase.ui .ui/svmDataDialogBase.h + .ui/svmDataDialogBase.h: batchExperimentDialogBase.ui + .ui/svmDataDialogBase.cpp: batchExperimentDialogBase.ui .ui/batchExperimentDialogBase.h *************** *** 165,169 **** .moc/moc_userDefinedEtExcitationFunctionDialog.cpp \ .moc/moc_userDefinedItExcitationFunctionDialogBase.cpp \ ! .moc/moc_userDefinedItExcitationFunctionDialog.cpp ModSim_SOURCES = helpWindow.hpp \ --- 179,189 ---- .moc/moc_userDefinedEtExcitationFunctionDialog.cpp \ .moc/moc_userDefinedItExcitationFunctionDialogBase.cpp \ ! .moc/moc_userDefinedItExcitationFunctionDialog.cpp \ ! .moc/moc_svmParametersDialogBase.cpp \ ! .moc/moc_svmParametersDialog.cpp \ ! .moc/moc_svmDataDialogBase.cpp \ ! .moc/moc_svmDataDialog.cpp \ ! .moc/moc_batchExperimentDialogBase.cpp \ ! .moc/moc_batchExperimentDialog.cpp ModSim_SOURCES = helpWindow.hpp \ *************** *** 217,220 **** --- 237,248 ---- scalingDialog.hpp \ scalingDialog.cpp \ + svmParametersDialog.hpp \ + svmParametersDialog.cpp \ + svmDataDialog.hpp \ + svmDataDialog.cpp \ + batchExperimentDialog.hpp \ + batchExperimentDialog.cpp \ + logger.hpp \ + logger.cpp \ mediator.hpp \ mediator.cpp \ *************** *** 249,252 **** --- 277,281 ---- BUILT_SOURCES = $(ModSim_MOC) $(ModSim_UI) + #ModSim_LDFLAGS = -Wl,--allow-multiple-definition $(GUI_LDFLAGS) ModSim_LDFLAGS = $(GUI_LDFLAGS) *************** *** 261,267 **** # of `deprecated' warnings generated by vtk 5.0 ModSim_CXXFLAGS = -DTIXML_USE_STL $(CXXFLAGS) $(QT_CXXFLAGS) -Wall -pedantic-errors\ ! -Wno-non-virtual-dtor -Wno-deprecated -Wno-long-long -Wno-strict-aliasing - ModSim_LDADD = ../../../../../Analysis/Data/libeppDataold.la ../../../../../Model/Problem/libeppProblem.la ../../../../../Model/Adapters/libeppAdapters.la ../../../../../Model/Ecco/libeppEcco.la ../../../../../Model/Solvers/libeppSolvers.la ../../../../../Model/Numerics/libeppNumerics.la ../../../../../Experiment/ExcitationFunction/libeppExcitationFunction.la ../../../../Visualization/libeppVisualization.la -L$(QUANTITIESLIB) -lPhysicalQuantities -lQuantity -L$(BSUTILITIESLIB) -lBSUtilities -L$(LOKILIB) -lloki -L$(GINACLIB) -lginac $(LDADD) $(QT_LDADD) $(VTK_LDADD) $(MODEL_LDADD) -lboost_serialization CLEANFILES = $(BUILT_SOURCES) --- 290,297 ---- # of `deprecated' warnings generated by vtk 5.0 ModSim_CXXFLAGS = -DTIXML_USE_STL $(CXXFLAGS) $(QT_CXXFLAGS) -Wall -pedantic-errors\ ! -Wno-non-virtual-dtor -Wno-deprecated -Wno-long-long -Wno-strict-aliasing ! ! ModSim_LDADD = ../../../../../Analysis/Classification/libeppClassification.la ../../../../../Analysis/Data/libeppDataold.la ../../../../../Model/Problem/libeppProblem.la ../../../../../Model/Adapters/libeppAdapters.la ../../../../../Model/Ecco/libeppEcco.la ../../../../../Model/Solvers/libeppSolvers.la ../../../../../Model/Numerics/libeppNumerics.la ../../../../../Experiment/ExcitationFunction/libeppExcitationFunction.la ../../../../../Experiment/Data/libeppData.la ../../../../../Experiment/Experiment/libeppExperiment.la ../../../../Visualization/libeppVisualization.la -L$(QUANTITIESLIB) -lPhysicalQuantities -lQuantity -L$(BSUTILITIESLIB) -lBSUtilities -L$(LOKILIB) -lloki -L$(GINACLIB) -lginac $(LDADD) $(QT_LDADD) $(VTK_LDADD) $(MODEL_LDADD) -lboost_serialization -lboost_date_time CLEANFILES = $(BUILT_SOURCES) |
|
From: Bernd S. <ber...@us...> - 2007-12-18 17:47:57
|
Update of /cvsroot/echempp/documentation In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv29862/documentation Modified Files: Notes.log Log Message: Index: Notes.log =================================================================== RCS file: /cvsroot/echempp/documentation/Notes.log,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Notes.log 27 Mar 2007 15:14:13 -0000 1.12 --- Notes.log 18 Dec 2007 17:47:45 -0000 1.13 *************** *** 214,215 **** --- 214,219 ---- of the Ecco package. + 18.12.2007 bs + + The patch file for x86_64 architectures on sourceforge.net has been renamed to reflect the + fact that it is a gzipped tar archive (although it contains only a single file). |
|
From: Bernd S. <ber...@us...> - 2007-12-11 10:06:23
|
Update of /cvsroot/echempp/GUI/documentation In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv4078 Modified Files: Notes.log Log Message: Index: Notes.log =================================================================== RCS file: /cvsroot/echempp/GUI/documentation/Notes.log,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Notes.log 26 Feb 2007 17:49:17 -0000 1.5 --- Notes.log 11 Dec 2007 10:05:42 -0000 1.6 *************** *** 36,40 **** 26.02.2007 bs ! adapted to be used on x96_64 architectures. (1) added code to GUI/acsite.m4, which was derived from http://3demi.net/astro/qastrocam/configure.in --- 36,40 ---- 26.02.2007 bs ! adapted to be used on x86_64 architectures. (1) added code to GUI/acsite.m4, which was derived from http://3demi.net/astro/qastrocam/configure.in |
|
From: SteffiBenthin <ste...@us...> - 2007-12-11 09:19:31
|
Update of /cvsroot/echempp/Model/Ecco In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv18463/Model/Ecco Modified Files: Makefile.am Log Message: makefile modified (no-long-long) Index: Makefile.am =================================================================== RCS file: /cvsroot/echempp/Model/Ecco/Makefile.am,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** Makefile.am 27 Mar 2007 13:06:41 -0000 1.34 --- Makefile.am 11 Dec 2007 09:19:11 -0000 1.35 *************** *** 181,185 **** # should be re-introduced later with a more recent spirit version libeppEcco_la_CXXFLAGS = -Wall -pedantic-errors \ ! -DTIXML_USE_STL libeppEcco_la_LDFLAGS = $(MODEL_LDFLAGS) -version-info 3:0:0 --- 181,185 ---- # should be re-introduced later with a more recent spirit version libeppEcco_la_CXXFLAGS = -Wall -pedantic-errors \ ! -DTIXML_USE_STL -Wno-long-long libeppEcco_la_LDFLAGS = $(MODEL_LDFLAGS) -version-info 3:0:0 |
|
From: SteffiBenthin <ste...@us...> - 2007-12-11 09:19:20
|
Update of /cvsroot/echempp/Model/Numerics In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv18463/Model/Numerics Modified Files: Makefile.am Log Message: makefile modified (no-long-long) Index: Makefile.am =================================================================== RCS file: /cvsroot/echempp/Model/Numerics/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile.am 23 Feb 2007 12:10:27 -0000 1.7 --- Makefile.am 11 Dec 2007 09:19:12 -0000 1.8 *************** *** 14,18 **** numericsError.hpp libeppNumerics_la_CXXFLAGS = -Wall -Werror -pedantic-errors\ ! -DTIXML_USE_STL libeppNumerics_la_LDFLAGS = $(MODEL_LDFLAGS) -version-info 0:0:0 --- 14,18 ---- numericsError.hpp libeppNumerics_la_CXXFLAGS = -Wall -Werror -pedantic-errors\ ! -DTIXML_USE_STL -Wno-long-long libeppNumerics_la_LDFLAGS = $(MODEL_LDFLAGS) -version-info 0:0:0 |
|
From: SteffiBenthin <ste...@us...> - 2007-12-11 09:19:19
|
Update of /cvsroot/echempp/Analysis/Data In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv18463/Analysis/Data Modified Files: Makefile.am Log Message: makefile modified (no-long-long) Index: Makefile.am =================================================================== RCS file: /cvsroot/echempp/Analysis/Data/Makefile.am,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Makefile.am 11 May 2007 14:50:50 -0000 1.16 --- Makefile.am 11 Dec 2007 09:19:11 -0000 1.17 *************** *** 34,37 **** --- 34,38 ---- -Wno-unused-parameter\ -Wno-parentheses\ + -Wno-long-long\ -DTIXML_USE_STL |
|
From: SteffiBenthin <ste...@us...> - 2007-12-11 09:19:17
|
Update of /cvsroot/echempp/Model/Solvers In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv18463/Model/Solvers Modified Files: Makefile.am Log Message: makefile modified (no-long-long) Index: Makefile.am =================================================================== RCS file: /cvsroot/echempp/Model/Solvers/Makefile.am,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** Makefile.am 23 Feb 2007 12:10:27 -0000 1.48 --- Makefile.am 11 Dec 2007 09:19:12 -0000 1.49 *************** *** 91,95 **** solversTypes.hpp \ tree.hpp ! libeppSolvers_la_CXXFLAGS = -Wall -Werror -pedantic-errors libeppSolvers_la_LDFLAGS = $(MODEL_LDFLAGS) -version-info 3:0:0 --- 91,96 ---- solversTypes.hpp \ tree.hpp ! libeppSolvers_la_CXXFLAGS = -Wall -Werror -pedantic-errors\ ! -Wno-long-long libeppSolvers_la_LDFLAGS = $(MODEL_LDFLAGS) -version-info 3:0:0 |
|
From: SteffiBenthin <ste...@us...> - 2007-12-11 09:19:17
|
Update of /cvsroot/echempp/Model/Problem In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv18463/Model/Problem Modified Files: Makefile.am Log Message: makefile modified (no-long-long) Index: Makefile.am =================================================================== RCS file: /cvsroot/echempp/Model/Problem/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile.am 9 Feb 2006 11:22:58 -0000 1.8 --- Makefile.am 11 Dec 2007 09:19:12 -0000 1.9 *************** *** 12,16 **** problemError.hpp libeppProblem_la_CXXFLAGS = -Wall -Werror -pedantic-errors \ ! -DTIXML_USE_STL libeppProblem_la_LDFLAGS = $(MODEL_LDFLAGS) -version-info 0:0:0 --- 12,16 ---- problemError.hpp libeppProblem_la_CXXFLAGS = -Wall -Werror -pedantic-errors \ ! -DTIXML_USE_STL -Wno-long-long libeppProblem_la_LDFLAGS = $(MODEL_LDFLAGS) -version-info 0:0:0 |
|
From: SteffiBenthin <ste...@us...> - 2007-12-10 17:06:16
|
Update of /cvsroot/echempp/GUI/Visualization In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv21165 Modified Files: vtkGraph.cpp vtkGraph.hpp Log Message: upgrade to VTK5.0 Index: vtkGraph.hpp =================================================================== RCS file: /cvsroot/echempp/GUI/Visualization/vtkGraph.hpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** vtkGraph.hpp 7 Mar 2007 20:41:15 -0000 1.13 --- vtkGraph.hpp 10 Dec 2007 17:06:09 -0000 1.14 *************** *** 158,166 **** VtkGraph<D>::draw() { ! // std::cout << "VtkGraph<D>::draw()" << std::endl; ! _renderer->RemoveAllProps(); this->drawAxisSystem(); this->drawBackground(); ! // std::cout << "VtkGraph<D>::draw() -- END" << std::endl; } --- 158,166 ---- VtkGraph<D>::draw() { ! //std::cout << "VtkGraph<D>::draw()" << std::endl; ! _renderer->RemoveAllViewProps(); this->drawAxisSystem(); this->drawBackground(); ! //std::cout << "VtkGraph<D>::draw() -- END" << std::endl; } *************** *** 187,191 **** VtkGraph<D>::drawAxisSystem (void) { ! // std::cout << "VtkGraph<D>::drawAxisSystem()" << std::endl; if( _axisSystem == NULL ) { --- 187,191 ---- VtkGraph<D>::drawAxisSystem (void) { ! std::cout << "VtkGraph<D>::drawAxisSystem()" << std::endl; if( _axisSystem == NULL ) { *************** *** 196,202 **** for(unsigned int i = 0; i < actors.size(); ++i) { ! _renderer->AddProp( actors[i] ); } ! // std::cout << "VtkGraph<D>::drawAxisSystem()" << std::endl; } --- 196,202 ---- for(unsigned int i = 0; i < actors.size(); ++i) { ! _renderer->AddViewProp( actors[i] ); } ! std::cout << "VtkGraph<D>::drawAxisSystem()" << std::endl; } Index: vtkGraph.cpp =================================================================== RCS file: /cvsroot/echempp/GUI/Visualization/vtkGraph.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** vtkGraph.cpp 7 Mar 2007 20:41:15 -0000 1.5 --- vtkGraph.cpp 10 Dec 2007 17:06:08 -0000 1.6 *************** *** 55,59 **** for(unsigned int i = 0; i < actors.size(); ++i) { ! ren->AddProp( actors[i] ); } --- 55,59 ---- for(unsigned int i = 0; i < actors.size(); ++i) { ! ren->AddViewProp( actors[i] ); } *************** *** 74,78 **** for(unsigned int i = 0; i < actors.size(); ++i) { ! ren->AddProp( actors[i] ); } --- 74,78 ---- for(unsigned int i = 0; i < actors.size(); ++i) { ! ren->AddViewProp( actors[i] ); } |
|
From: Bernd S. <ber...@us...> - 2007-05-21 07:04:39
|
Update of /cvsroot/echempp
In directory sc8-pr-cvs17:/tmp/cvs-serv2777
Modified Files:
README
Log Message:
Index: README
===================================================================
RCS file: /cvsroot/echempp/README,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** README 26 Feb 2007 18:04:54 -0000 1.26
--- README 21 May 2007 07:04:26 -0000 1.27
***************
*** 35,39 ****
http://sourceforge.net/projects/quantity
! 3) The VTK-4.4 library (currently only available as a interim release)
http://www.vtk.org
--- 35,39 ----
http://sourceforge.net/projects/quantity
! 3) The VTK-4.4 library (currently only available as an interim release)
http://www.vtk.org
***************
*** 60,64 ****
Alternatively, Boost-1.33.1 and Spirit-1.8.3 have been used
(please note that currently, Spirit has a problem on x86_64
! architectures).
5) The symbolic algebra package GiNaC available at www.ginac.de
--- 60,64 ----
Alternatively, Boost-1.33.1 and Spirit-1.8.3 have been used
(please note that currently, Spirit has a problem on x86_64
! architectures with gcc version < 4.3).
5) The symbolic algebra package GiNaC available at www.ginac.de
|
|
From: Bernd S. <ber...@us...> - 2007-05-19 15:52:33
|
Update of /cvsroot/echempp/Experiment/ExcitationFunction/documentation In directory sc8-pr-cvs17:/tmp/cvs-serv10842/Experiment/ExcitationFunction/documentation Modified Files: Notes.log Log Message: TinyXml 2.5.3 used - xml load problem solved Index: Notes.log =================================================================== RCS file: /cvsroot/echempp/Experiment/ExcitationFunction/documentation/Notes.log,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** Notes.log 19 Dec 2006 13:05:47 -0000 1.37 --- Notes.log 19 May 2007 15:52:13 -0000 1.38 *************** *** 535,536 **** --- 535,544 ---- XML load/save functions: values and units are saved in separate attributes + + 19.5.2007, bs + + Dominik Brugger reported a problem with loading the examples. Indeed, this could + be reproduced on echem3 (but not on my notebook). In the meantime, I have + substituted the olf TinyXml version (2.4.2) by version 2.5.3 and loading works + again. However, the load functions had to be adapted to some changes + in the TinyXml API. |
|
From: Bernd S. <ber...@us...> - 2007-05-19 15:52:27
|
Update of /cvsroot/echempp/Experiment/ExcitationFunction/test
In directory sc8-pr-cvs17:/tmp/cvs-serv10842/Experiment/ExcitationFunction/test
Modified Files:
excitationFunctionTest.cpp
Log Message:
TinyXml 2.5.3 used - xml load problem solved
Index: excitationFunctionTest.cpp
===================================================================
RCS file: /cvsroot/echempp/Experiment/ExcitationFunction/test/excitationFunctionTest.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** excitationFunctionTest.cpp 15 May 2007 14:10:45 -0000 1.23
--- excitationFunctionTest.cpp 19 May 2007 15:52:13 -0000 1.24
***************
*** 1014,1026 ****
CVExcitationFunction cv_xmlload;
- // only for testing
- std::cout << " CVExcitationFunction object generated!" << std::endl;
-
try {
TiXmlHandle root = BSUtilities::xmlr::xmlInit (xmlsave_ef_filename);
- std::cout << " root generated!" << std::endl;
cv_xmlload.load (root);
- std::cout << " root finished!" << std::endl;
BSUtilities::xmlr::xmlFinish (root);
std::cout << " file `" << xmlsave_ef_filename
--- 1014,1021 ----
|
|
From: Bernd S. <ber...@us...> - 2007-05-19 15:52:24
|
Update of /cvsroot/echempp/Experiment/ExcitationFunction
In directory sc8-pr-cvs17:/tmp/cvs-serv10842/Experiment/ExcitationFunction
Modified Files:
excitationFunction.hpp segment.hpp
Log Message:
TinyXml 2.5.3 used - xml load problem solved
Index: excitationFunction.hpp
===================================================================
RCS file: /cvsroot/echempp/Experiment/ExcitationFunction/excitationFunction.hpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** excitationFunction.hpp 15 May 2007 14:10:45 -0000 1.38
--- excitationFunction.hpp 19 May 2007 15:52:13 -0000 1.39
***************
*** 328,349 ****
this->clear();
- int i = node.Node()->Type();
- std::cout << " type: " << i << "element type = " << TiXmlNode::ELEMENT << std::endl;
TiXmlElement *element = node.Element();
- std::cout << "attribute segmentNumber: " << element->Attribute ("segmentNumber") << std::endl;
- FILE *out1 = fopen ("outfile1", "w");
- element->Print (out1, 1);
- fclose (out1);
-
- std::cout << " Tag zum Vergleich: `" << ExcitationFunction::TAG << "'" << std::endl;
- //std::cout << " in ef load, TAG: `" << element->ValueStr () << "'" << std::endl;
! if (element )
! {
! /*
! if (element->ValueStr() == ExcitationFunction::TAG)
{
- */
- std::cout << "in element" << std::endl;
TiXmlNode *child = 0;
--- 328,335 ----
this->clear();
TiXmlElement *element = node.Element();
! if (element && (element->ValueStr() == ExcitationFunction::TAG))
{
TiXmlNode *child = 0;
***************
*** 351,363 ****
(Segments::Segment::TAG, child)))
{
- std::cout << "in child" << std::endl;
if ((child->ToElement ())->Attribute
(Segments::Segment::IDTAG))
{
- std::cout << "in attribute" << std::endl;
Segments::DISegment<D, I> *new_segment
= Segments::DISegment<D, I>::Factory::Instance().
! CreateObject((child->ToElement ())->Attribute
! (Segments::Segment::IDTAG));
new_segment->load (TiXmlHandle (child));
--- 337,347 ----
(Segments::Segment::TAG, child)))
{
if ((child->ToElement ())->Attribute
(Segments::Segment::IDTAG))
{
Segments::DISegment<D, I> *new_segment
= Segments::DISegment<D, I>::Factory::Instance().
! CreateObject(*((child->ToElement ())->Attribute
! (Segments::Segment::IDTAG)));
new_segment->load (TiXmlHandle (child));
***************
*** 366,370 ****
}
}
- // }
}
else
--- 350,353 ----
***************
*** 896,909 ****
this->clear();
- int i = node.Node()->Type();
- std::cout << " type: " << i << "element type = " << TiXmlNode::ELEMENT << std::endl;
TiXmlElement *element = node.Element();
- std::cout << "attribute segmentNumber: " << element->Attribute ("segmentNumber") << std::endl;
- FILE *out = fopen ("outfile", "w");
- element->Print (out, 1);
- fclose (out);
-
- std::cout << " Tag zum Vergleich: `" << ExcitationFunction::TAG << "'" << std::endl;
- //std::cout << " in sd_ef load, TAG: `" << element->ValueStr () << "'" << std::endl;
if (element && (element->ValueStr() == ExcitationFunction::TAG))
{
--- 879,883 ----
Index: segment.hpp
===================================================================
RCS file: /cvsroot/echempp/Experiment/ExcitationFunction/segment.hpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** segment.hpp 15 May 2007 14:10:45 -0000 1.36
--- segment.hpp 19 May 2007 15:52:13 -0000 1.37
***************
*** 461,485 ****
void load (const TiXmlHandle node)
{
- int i = node.Node()->Type();
- std::cout << " type: " << i << "element type = " << TiXmlNode::ELEMENT << std::endl;
TiXmlElement *element = node.Element();
- std::cout << " Tag zum Vergleich: `" << Segment::TAG << "'" << std::endl;
-
-
- // commented for testing
- /*
if (element
&& (element->ValueStr () == Segment::TAG)
! && (element->Attribute(Segment::IDTAG) == ID))
{
- */
if (element->Attribute(STARTINGVALUE) &&
element->Attribute(STARTINGUNIT))
{
! std::string val = element->Attribute(STARTINGVALUE);
val.append(" ");
! val.append(element->Attribute(STARTINGUNIT));
_startingValue = val;
}
--- 461,477 ----
void load (const TiXmlHandle node)
{
TiXmlElement *element = node.Element();
if (element
&& (element->ValueStr () == Segment::TAG)
! && (*element->Attribute(Segment::IDTAG) == ID))
{
if (element->Attribute(STARTINGVALUE) &&
element->Attribute(STARTINGUNIT))
{
! std::string val = *element->Attribute(STARTINGVALUE);
val.append(" ");
! val.append(*element->Attribute(STARTINGUNIT));
_startingValue = val;
}
***************
*** 487,493 ****
element->Attribute(ENDUNIT))
{
! std::string val = element->Attribute(ENDVALUE);
val.append(" ");
! val.append(element->Attribute(ENDUNIT));
_endValue = val;
}
--- 479,485 ----
element->Attribute(ENDUNIT))
{
! std::string val = *element->Attribute(ENDVALUE);
val.append(" ");
! val.append(*element->Attribute(ENDUNIT));
_endValue = val;
}
***************
*** 495,512 ****
element->Attribute(Segment::IMAXUNIT))
{
! std::string val = element->Attribute(Segment::IMAXVALUE);
val.append(" ");
! val.append(element->Attribute(Segment::IMAXUNIT));
DISegment<D,I>::_Imax = val;
}
_derivative = (_endValue - _startingValue)/DISegment<D,I>::_Imax;
- // commented for testing
- /*
}
else
throw LoadError
("error loading linear segment: incorrect element");
- */
}
--- 487,501 ----
element->Attribute(Segment::IMAXUNIT))
{
! std::string val = *element->Attribute(Segment::IMAXVALUE);
val.append(" ");
! val.append(*element->Attribute(Segment::IMAXUNIT));
DISegment<D,I>::_Imax = val;
}
_derivative = (_endValue - _startingValue)/DISegment<D,I>::_Imax;
}
else
throw LoadError
("error loading linear segment: incorrect element");
}
***************
*** 728,744 ****
{
TiXmlElement *element = node.Element();
- // commented for testing
- /*
if (element
&& (element->ValueStr () == Segment::TAG)
! && (element->Attribute(Segment::IDTAG) == ID))
{
- */
if (element->Attribute(CONSTANTVALUE) &&
element->Attribute(CONSTANTUNIT))
{
! std::string val = element->Attribute(CONSTANTVALUE);
val.append(" ");
! val.append(element->Attribute(CONSTANTUNIT));
_constantValue = val;
}
--- 717,730 ----
{
TiXmlElement *element = node.Element();
if (element
&& (element->ValueStr () == Segment::TAG)
! && (*element->Attribute(Segment::IDTAG) == ID))
{
if (element->Attribute(CONSTANTVALUE) &&
element->Attribute(CONSTANTUNIT))
{
! std::string val = *element->Attribute(CONSTANTVALUE);
val.append(" ");
! val.append(*element->Attribute(CONSTANTUNIT));
_constantValue = val;
}
***************
*** 746,762 ****
element->Attribute(Segment::IMAXUNIT))
{
! std::string val = element->Attribute(Segment::IMAXVALUE);
val.append(" ");
! val.append(element->Attribute(Segment::IMAXUNIT));
DISegment<D,I>::_Imax = val;
}
- // commented for testing
- /*
-
}
else
throw LoadError
("error loading constant segment: incorrect element");
- */
}
--- 732,744 ----
element->Attribute(Segment::IMAXUNIT))
{
! std::string val = *element->Attribute(Segment::IMAXVALUE);
val.append(" ");
! val.append(*element->Attribute(Segment::IMAXUNIT));
DISegment<D,I>::_Imax = val;
}
}
else
throw LoadError
("error loading constant segment: incorrect element");
}
***************
*** 1024,1035 ****
if (element
&& (element->ValueStr () == Segment::TAG)
! && (element->Attribute(Segment::IDTAG) == ID))
{
if (element->Attribute(OFFSETVALUE) &&
element->Attribute(OFFSETUNIT) )
{
! std::string val = element->Attribute(OFFSETVALUE);
val.append(" ");
! val.append(element->Attribute(OFFSETUNIT));
_offset = val;
}
--- 1006,1017 ----
if (element
&& (element->ValueStr () == Segment::TAG)
! && (*element->Attribute(Segment::IDTAG) == ID))
{
if (element->Attribute(OFFSETVALUE) &&
element->Attribute(OFFSETUNIT) )
{
! std::string val = *element->Attribute(OFFSETVALUE);
val.append(" ");
! val.append(*element->Attribute(OFFSETUNIT));
_offset = val;
}
***************
*** 1037,1043 ****
element->Attribute(AMPLITUDEUNIT))
{
! std::string val = element->Attribute(AMPLITUDEVALUE);
val.append(" ");
! val.append(element->Attribute(AMPLITUDEUNIT));
_amplitude = val;
}
--- 1019,1025 ----
element->Attribute(AMPLITUDEUNIT))
{
! std::string val = *element->Attribute(AMPLITUDEVALUE);
val.append(" ");
! val.append(*element->Attribute(AMPLITUDEUNIT));
_amplitude = val;
}
***************
*** 1045,1051 ****
element->Attribute(ANGULARFREQUENCYUNIT) )
{
! std::string val = element->Attribute(ANGULARFREQUENCYVALUE);
val.append(" ");
! val.append(element->Attribute(ANGULARFREQUENCYUNIT));
_angularFrequency = val;
}
--- 1027,1033 ----
element->Attribute(ANGULARFREQUENCYUNIT) )
{
! std::string val = *element->Attribute(ANGULARFREQUENCYVALUE);
val.append(" ");
! val.append(*element->Attribute(ANGULARFREQUENCYUNIT));
_angularFrequency = val;
}
***************
*** 1053,1059 ****
element->Attribute(PHASESHIFTUNIT) )
{
! std::string val = element->Attribute(PHASESHIFTVALUE);
val.append(" ");
! val.append(element->Attribute(PHASESHIFTUNIT));
_phaseShift = val;
}
--- 1035,1041 ----
element->Attribute(PHASESHIFTUNIT) )
{
! std::string val = *element->Attribute(PHASESHIFTVALUE);
val.append(" ");
! val.append(*element->Attribute(PHASESHIFTUNIT));
_phaseShift = val;
}
***************
*** 1061,1067 ****
element->Attribute(Segment::IMAXUNIT))
{
! std::string val = element->Attribute(Segment::IMAXVALUE);
val.append(" ");
! val.append(element->Attribute(Segment::IMAXUNIT));
DISegment<D,I>::_Imax = val;
}
--- 1043,1049 ----
element->Attribute(Segment::IMAXUNIT))
{
! std::string val = *element->Attribute(Segment::IMAXVALUE);
val.append(" ");
! val.append(*element->Attribute(Segment::IMAXUNIT));
DISegment<D,I>::_Imax = val;
}
***************
*** 1354,1365 ****
if (element
&& (element->ValueStr () == Segment::TAG)
! && (element->Attribute(Segment::IDTAG) == ID))
{
if (element->Attribute(D0VALUE) &&
element->Attribute(D0UNIT))
{
! std::string val = element->Attribute(D0VALUE);
val.append(" ");
! val.append(element->Attribute(D0UNIT));
_d0 = val;
}
--- 1336,1347 ----
if (element
&& (element->ValueStr () == Segment::TAG)
! && (*element->Attribute(Segment::IDTAG) == ID))
{
if (element->Attribute(D0VALUE) &&
element->Attribute(D0UNIT))
{
! std::string val = *element->Attribute(D0VALUE);
val.append(" ");
! val.append(*element->Attribute(D0UNIT));
_d0 = val;
}
***************
*** 1367,1373 ****
element->Attribute(D1UNIT))
{
! std::string val = element->Attribute(D1VALUE);
val.append(" ");
! val.append(element->Attribute(D1UNIT));
_d1 = val;
}
--- 1349,1355 ----
element->Attribute(D1UNIT))
{
! std::string val = *element->Attribute(D1VALUE);
val.append(" ");
! val.append(*element->Attribute(D1UNIT));
_d1 = val;
}
***************
*** 1379,1385 ****
element->Attribute(Segment::IMAXUNIT))
{
! std::string val = element->Attribute(Segment::IMAXVALUE);
val.append(" ");
! val.append(element->Attribute(Segment::IMAXUNIT));
DISegment<D,I>::_Imax = val;
}
--- 1361,1367 ----
element->Attribute(Segment::IMAXUNIT))
{
! std::string val = *element->Attribute(Segment::IMAXVALUE);
val.append(" ");
! val.append(*element->Attribute(Segment::IMAXUNIT));
DISegment<D,I>::_Imax = val;
}
***************
*** 1652,1663 ****
if (element
&& (element->ValueStr () == Segment::TAG)
! && (element->Attribute(Segment::IDTAG) == ID))
{
if (element->Attribute(D0VALUE) &&
element->Attribute(D0UNIT))
{
! std::string val = element->Attribute(D0VALUE);
val.append(" ");
! val.append(element->Attribute(D0UNIT));
_d0 = val;
}
--- 1634,1645 ----
if (element
&& (element->ValueStr () == Segment::TAG)
! && (*element->Attribute(Segment::IDTAG) == ID))
{
if (element->Attribute(D0VALUE) &&
element->Attribute(D0UNIT))
{
! std::string val = *element->Attribute(D0VALUE);
val.append(" ");
! val.append(*element->Attribute(D0UNIT));
_d0 = val;
}
***************
*** 1665,1671 ****
element->Attribute(D1UNIT))
{
! std::string val = element->Attribute(D1VALUE);
val.append(" ");
! val.append(element->Attribute(D1UNIT));
_d1 = val;
}
--- 1647,1653 ----
element->Attribute(D1UNIT))
{
! std::string val = *element->Attribute(D1VALUE);
val.append(" ");
! val.append(*element->Attribute(D1UNIT));
_d1 = val;
}
***************
*** 1673,1679 ****
element->Attribute(OMEGAUNIT))
{
! std::string val = element->Attribute(OMEGAVALUE);
val.append(" ");
! val.append(element->Attribute(OMEGAUNIT));
_omega = val;
}
--- 1655,1661 ----
element->Attribute(OMEGAUNIT))
{
! std::string val = *element->Attribute(OMEGAVALUE);
val.append(" ");
! val.append(*element->Attribute(OMEGAUNIT));
_omega = val;
}
***************
*** 1681,1687 ****
element->Attribute(Segment::IMAXUNIT))
{
! std::string val = element->Attribute(Segment::IMAXVALUE);
val.append(" ");
! val.append(element->Attribute(Segment::IMAXUNIT));
DISegment<D,I>::_Imax = val;
}
--- 1663,1669 ----
element->Attribute(Segment::IMAXUNIT))
{
! std::string val = *element->Attribute(Segment::IMAXVALUE);
val.append(" ");
! val.append(*element->Attribute(Segment::IMAXUNIT));
DISegment<D,I>::_Imax = val;
}
***************
*** 1988,1999 ****
if (element
&& (element->ValueStr () == Segment::TAG)
! && (element->Attribute(Segment::IDTAG) == ID))
{
if (element->Attribute(D0VALUE) &&
element->Attribute(D0UNIT) )
{
! std::string val = element->Attribute(D0VALUE);
val.append(" ");
! val.append(element->Attribute(D0UNIT));
_d0 = val;
}
--- 1970,1981 ----
if (element
&& (element->ValueStr () == Segment::TAG)
! && (*element->Attribute(Segment::IDTAG) == ID))
{
if (element->Attribute(D0VALUE) &&
element->Attribute(D0UNIT) )
{
! std::string val = *element->Attribute(D0VALUE);
val.append(" ");
! val.append(*element->Attribute(D0UNIT));
_d0 = val;
}
***************
*** 2001,2007 ****
element->Attribute(D1UNIT) )
{
! std::string val = element->Attribute(D1VALUE);
val.append(" ");
! val.append(element->Attribute(D1UNIT));
_d1 = val;
}
--- 1983,1989 ----
element->Attribute(D1UNIT) )
{
! std::string val = *element->Attribute(D1VALUE);
val.append(" ");
! val.append(*element->Attribute(D1UNIT));
_d1 = val;
}
***************
*** 2013,2019 ****
element->Attribute(OMEGAUNIT))
{
! std::string val = element->Attribute(OMEGAVALUE);
val.append(" ");
! val.append(element->Attribute(OMEGAUNIT));
_omega = val;
}
--- 1995,2001 ----
element->Attribute(OMEGAUNIT))
{
! std::string val = *element->Attribute(OMEGAVALUE);
val.append(" ");
! val.append(*element->Attribute(OMEGAUNIT));
_omega = val;
}
***************
*** 2021,2027 ****
element->Attribute(Segment::IMAXUNIT))
{
! std::string val = element->Attribute(Segment::IMAXVALUE);
val.append(" ");
! val.append(element->Attribute(Segment::IMAXUNIT));
DISegment<D,I>::_Imax = val;
}
--- 2003,2009 ----
element->Attribute(Segment::IMAXUNIT))
{
! std::string val = *element->Attribute(Segment::IMAXVALUE);
val.append(" ");
! val.append(*element->Attribute(Segment::IMAXUNIT));
DISegment<D,I>::_Imax = val;
}
***************
*** 2281,2292 ****
if (element
&& (element->ValueStr () == Segment::TAG)
! && (element->Attribute(Segment::IDTAG) == ID))
{
if (element->Attribute(DIGITALVALUE) &&
element->Attribute(DIGITALUNIT) )
{
! std::string val = element->Attribute(DIGITALVALUE);
val.append(" ");
! val.append(element->Attribute(DIGITALUNIT));
_digitalValue = val;
}
--- 2263,2274 ----
if (element
&& (element->ValueStr () == Segment::TAG)
! && (*element->Attribute(Segment::IDTAG) == ID))
{
if (element->Attribute(DIGITALVALUE) &&
element->Attribute(DIGITALUNIT) )
{
! std::string val = *element->Attribute(DIGITALVALUE);
val.append(" ");
! val.append(*element->Attribute(DIGITALUNIT));
_digitalValue = val;
}
***************
*** 2294,2300 ****
element->Attribute(Segment::IMAXUNIT))
{
! std::string val = element->Attribute(Segment::IMAXVALUE);
val.append(" ");
! val.append(element->Attribute(Segment::IMAXUNIT));
DISegment<quantity::Digital,I>::_Imax = val;
}
--- 2276,2282 ----
element->Attribute(Segment::IMAXUNIT))
{
! std::string val = *element->Attribute(Segment::IMAXVALUE);
val.append(" ");
! val.append(*element->Attribute(Segment::IMAXUNIT));
DISegment<quantity::Digital,I>::_Imax = val;
}
|
|
From: beeblbrox <bee...@us...> - 2007-05-17 14:19:02
|
Update of /cvsroot/echempp/Experiment/Experiment
In directory sc8-pr-cvs17:/tmp/cvs-serv12861
Added Files:
Technique.hpp
Log Message:
Initial version
--- NEW FILE: Technique.hpp ---
/*! \file Technique.hpp
\brief header file for technique types.
Technique.hpp is part of the Experiment package.
*/
/* Copyright (C) 2007, Dominik Brugger, Bernd Speiser
This file is part of EChem++.
EChem++ is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
EChem++ is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
*/
// $Id: Technique.hpp,v 1.3 2007/05/17 14:18:58 beeblbrox Exp $
#ifndef __TECHNIQUE_HPP__
#define __TECHNIQUE_HPP__
namespace experiment
{
template<class Realism,
class Dynamics,
class I,
class D,
class R,
template<class, class> class SegmentType>
class Technique
{
public:
typedef Realism realism_type;
typedef Dynamics dynamics_type;
typedef I independent_type;
typedef D dependent_type;
typedef R result_type;
typedef SegmentType<D,I> segment_type;
};
} // end namespace experiment
#endif
|
|
From: beeblbrox <bee...@us...> - 2007-05-17 14:17:46
|
Update of /cvsroot/echempp/Experiment/Experiment In directory sc8-pr-cvs17:/tmp/cvs-serv12449 Removed Files: TechniqueType.hpp Log Message: Renamed Technique.hpp --- TechniqueType.hpp DELETED --- |
|
From: beeblbrox <bee...@us...> - 2007-05-17 14:08:31
|
Update of /cvsroot/echempp/Experiment/Experiment In directory sc8-pr-cvs17:/tmp/cvs-serv8707 Removed Files: Technique.hpp Log Message: bogus. --- Technique.hpp DELETED --- |
|
From: beeblbrox <bee...@us...> - 2007-05-17 14:06:31
|
Update of /cvsroot/echempp/Experiment/Experiment
In directory sc8-pr-cvs17:/tmp/cvs-serv7734
Added Files:
Technique.hpp
Log Message:
Initial version.
--- NEW FILE: Technique.hpp ---
/*! \file Technique.hpp
\brief header file for technique types.
Technique.hpp is part of the Experiment package.
*/
/* Copyright (C) 2007, Dominik Brugger, Bernd Speiser
This file is part of EChem++.
EChem++ is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
EChem++ is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
*/
// $Id: Technique.hpp,v 1.1 2007/05/17 14:06:25 beeblbrox Exp $
#ifndef __TECHNIQUE_HPP__
#define __TECHNIQUE_HPP__
namespace experiment
{
template<class Realism,
class Dynamics,
class I,
class D,
class R,
template<class, class> class SegmentType>
class Technique
{
public:
// static const std::string TSID;
typedef Realism realism_type;
typedef Dynamics dynamics_type;
typedef I independent_type;
typedef D dependent_type;
typedef R result_type;
typedef SegmentType<D,I> segment_type;
};
} // end namespace experiment
#endif
|
|
From: beeblbrox <bee...@us...> - 2007-05-17 14:03:18
|
Update of /cvsroot/echempp/Experiment/Experiment
In directory sc8-pr-cvs17:/tmp/cvs-serv5900
Modified Files:
Experiment.hpp
Log Message:
Added new auto-registration mechanism. SerializationTools.h is assumed
to used static const std::string GUID of each class, where this variable
is initialized via create_guid.
TechniqueType shortened to Technique.
Index: Experiment.hpp
===================================================================
RCS file: /cvsroot/echempp/Experiment/Experiment/Experiment.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Experiment.hpp 5 May 2007 08:49:07 -0000 1.5
--- Experiment.hpp 17 May 2007 14:02:41 -0000 1.6
***************
*** 58,66 ****
// Local includes
#include "ExcitationFunction/excitationFunction.hpp"
! #include "Experiment/TechniqueType.hpp"
namespace experiment
{
//! Unary functor for deletion.
template<typename Obj>
--- 58,97 ----
// Local includes
#include "ExcitationFunction/excitationFunction.hpp"
! #include "Experiment/Technique.hpp"
namespace experiment
{
+ template<class T>
+ const std::string type2name()
+ {
+ return T::create_guid();
+ }
+ template<>
+ const std::string type2name<quantity::CelsiusTemperature>()
+ {
+ return "CelsiusTemperature";
+ }
+ template<>
+ const std::string type2name<quantity::Time>()
+ {
+ return "Time";
+ }
+ template<>
+ const std::string type2name<quantity::ElectricPotential>()
+ {
+ return "ElectricPotential";
+ }
+ template<>
+ const std::string type2name<quantity::ElectricCurrent>()
+ {
+ return "ElectricCurrent";
+ }
+ template<>
+ const std::string type2name<Loki::EmptyType>()
+ {
+ return "EmptyType";
+ }
+
//! Unary functor for deletion.
template<typename Obj>
***************
*** 85,103 ****
struct Simulated
{
! static const std::string TSID;
};
- const std::string Simulated::TSID = "experiment::realism::Simulated";
//! Type used to designate real experiments.
struct Real
{
! static const std::string TSID;
};
- const std::string Real::TSID = "experiment::realism::Real";
//! Type used to designate dual experiments, e.g. one part real the other simulated.
struct Dual
{
! static const std::string TSID;
};
- const std::string Dual::TSID = "experiment::realism::Dual";
}
//! Namespace for dynamics types.
--- 116,140 ----
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.
***************
*** 107,119 ****
struct Dynamic
{
! static const std::string TSID;
};
- const std::string Dynamic::TSID = "experiment::dynamics::Dynamic";
//! Type used to designate static experiments.
struct Static
{
! static const std::string TSID;
};
- const std::string Static::TSID = "experiment::dynamics::Static";
}
--- 144,160 ----
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";
! }
};
}
***************
*** 177,186 ****
//! Atomic experiments are used to represent self-contained
//! experiments that are not further divisible.
! template<class TechType>
class Atomic : public Experiment
{
public:
! typedef typename TechType::dynamics_type dynamics_type;
! typedef typename TechType::realism_type realism_type;
Atomic() {}
Atomic(const std::string title) : Experiment(title) {}
--- 218,227 ----
//! Atomic experiments are used to represent self-contained
//! experiments that are not further divisible.
! template<class Tech>
class Atomic : public Experiment
{
public:
! typedef typename Tech::dynamics_type dynamics_type;
! typedef typename Tech::realism_type realism_type;
Atomic() {}
Atomic(const std::string title) : Experiment(title) {}
***************
*** 220,224 ****
//! \sa Induced
//! \sa Observation
! template<class TechType> class Action : public Atomic<TechType> {};
template<class Realism,
class Dynamics,
--- 261,265 ----
//! \sa Induced
//! \sa Observation
! template<class Tech> class Action : public Atomic<Tech> {};
template<class Realism,
class Dynamics,
***************
*** 227,241 ****
class R,
template<class, class> class S>
! class Action<TechniqueType<Realism, Dynamics, I, D, R, S> >
! : public Atomic<TechniqueType<Realism, Dynamics, I, D, R, S> >
{
public:
! typedef TechniqueType<Realism, Dynamics, I, D, R, S> TechType;
! // BSUtilities::AutoRegistor<Action<TechType> > reg;
! // static const std::string TSID;
! typedef Atomic<TechType>
_AtomicBase;
! typedef Action<TechType>
_Action;
Action() {}
Action(const std::string title) : _AtomicBase(title) {}
--- 268,289 ----
class R,
template<class, class> class S>
! class Action<Technique<Realism, Dynamics, I, D, R, S> >
! : public Atomic<Technique<Realism, Dynamics, I, D, R, S> >
{
public:
! typedef Technique<Realism, Dynamics, I, D, R, S> Tech;
! typedef Atomic<Tech>
_AtomicBase;
! typedef Action<Tech>
_Action;
+ static const std::string create_guid()
+ {
+ // TODO Use Segment Type as well
+ return "Action_" + type2name<Realism>() + "_"
+ + type2name<Dynamics>() + "_" + type2name<I>() + "_"
+ + type2name<D>() + "_" + type2name<R>();
+ }
+ BSUtilities::AutoRegistor<Action<Tech> > reg;
+ static const std::string GUID;
Action() {}
Action(const std::string title) : _AtomicBase(title) {}
***************
*** 325,337 ****
};
! // template<class Realism,
! // class Dynamics,
! // class I,
! // class D,
! // class R,
! // template<class, class> class S>
! // const std::string Action<TechniqueType<Realism,Dynamics,I,D,R,S> >::TSID =
! // "experiment::Action" +
! // BSUtilities::TypeToName<TechniqueType<Realism,Dynamics,I,D,R,S> >();
//! Class to represent induced experiments.
--- 373,384 ----
};
! 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.
***************
*** 340,344 ****
//! \sa Action
//! \sa Observation
! template<class TechType> class Induced : public Atomic<TechType> {};
template<class Realism,
class Dynamics,
--- 387,391 ----
//! \sa Action
//! \sa Observation
! template<class Tech> class Induced : public Atomic<Tech> {};
template<class Realism,
class Dynamics,
***************
*** 347,358 ****
class R,
template<class, class> class S>
! class Induced<TechniqueType<Realism, Dynamics, I, D, R, S> >
! : public Atomic<TechniqueType<Realism, Dynamics, I, D, R, S> >
{
public:
! typedef Atomic<TechniqueType<Realism, Dynamics, I, D, R, S> >
_AtomicBase;
! typedef Induced<TechniqueType<Realism, Dynamics, I, D, R, S> >
_Induced;
Induced() {};
virtual ~Induced() { std::cout << "Called ~Induced" << std::endl; };
--- 394,415 ----
class R,
template<class, class> class S>
! class Induced<Technique<Realism, Dynamics, I, D, R, S> >
! : public Atomic<Technique<Realism, Dynamics, I, D, R, S> >
{
public:
! typedef Technique<Realism, Dynamics, I, D, R, S> Tech;
! typedef Atomic<Tech>
_AtomicBase;
! 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::AutoRegistor<Induced<Tech> > reg;
+ static const std::string GUID;
Induced() {};
virtual ~Induced() { std::cout << "Called ~Induced" << std::endl; };
***************
*** 442,446 ****
R result;
};
!
//! Class to represent Observations.
//! Dynamic Observations collect information about the
--- 499,512 ----
R result;
};
!
! 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
***************
*** 449,458 ****
//! \sa Action
//! \sa Induced
! template<class TechType>
! class Observation : Atomic<TechType> {};
! // {
! // private:
! // Observation(){}
! // };
// partial template specialization to enforce constraint,
--- 515,520 ----
//! \sa Action
//! \sa Induced
! template<class Tech>
! class Observation : Atomic<Tech> {};
// partial template specialization to enforce constraint,
***************
*** 462,472 ****
class I,
class R>
! class Observation<TechniqueType<Realism, dynamics::Dynamic, I, Loki::EmptyType, R, BSUtilities::EmptyTemplate_2> >
! : public Atomic<TechniqueType<Realism, dynamics::Dynamic, I, Loki::EmptyType, R, BSUtilities::EmptyTemplate_2> >
{
public:
Observation() {};
! typedef Observation<TechniqueType<Realism, dynamics::Dynamic, I, Loki::EmptyType, R, BSUtilities::EmptyTemplate_2> > _Observation;
! typedef Atomic<TechniqueType<Realism, dynamics::Dynamic, I, Loki::EmptyType, R, BSUtilities::EmptyTemplate_2> > _AtomicBase;
Observation(const I start, const I end)
: start_(start), end_(end) {};
--- 524,543 ----
class I,
class R>
! class Observation<Technique<Realism, dynamics::Dynamic, I, Loki::EmptyType, R, BSUtilities::EmptyTemplate_2> >
! : public Atomic<Technique<Realism, dynamics::Dynamic, I, Loki::EmptyType, R, BSUtilities::EmptyTemplate_2> >
{
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::AutoRegistor<Observation<Tech> > reg;
+ static const std::string GUID;
Observation() {};
! typedef Observation<Tech> _Observation;
! typedef Atomic<Tech > _AtomicBase;
Observation(const I start, const I end)
: start_(start), end_(end) {};
***************
*** 537,555 ****
template<class Realism,
class R>
! class Observation<TechniqueType<Realism, dynamics::Static, Loki::EmptyType,
Loki::EmptyType,
R, BSUtilities::EmptyTemplate_2> >
! : public Atomic<TechniqueType<Realism, dynamics::Static, Loki::EmptyType,
Loki::EmptyType,
R, BSUtilities::EmptyTemplate_2> >
{
public:
! typedef Observation<TechniqueType<Realism, dynamics::Static, Loki::EmptyType,
! Loki::EmptyType,
! R, BSUtilities::EmptyTemplate_2> > _Observation;
! typedef Atomic<TechniqueType<Realism, dynamics::Static, Loki::EmptyType,
! Loki::EmptyType,
! R, BSUtilities::EmptyTemplate_2> > _AtomicBase;
Observation() {};
virtual ~Observation() { std::cout << "Called ~Observation" << std::endl; };
--- 608,639 ----
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,
Loki::EmptyType,
R, BSUtilities::EmptyTemplate_2> >
! : public Atomic<Technique<Realism, dynamics::Static, Loki::EmptyType,
Loki::EmptyType,
R, BSUtilities::EmptyTemplate_2> >
{
public:
! typedef Technique<Realism, dynamics::Static, Loki::EmptyType,
! Loki::EmptyType, R, BSUtilities::EmptyTemplate_2>
! Tech;
! static const std::string create_guid()
! {
! return "Observation_" + type2name<Realism>() + "_"
! + type2name<R>();
! }
! BSUtilities::AutoRegistor<Observation<Tech> > reg;
! static const std::string GUID;
!
! typedef Observation<Tech> _Observation;
! typedef Atomic<Tech> _AtomicBase;
Observation() {};
virtual ~Observation() { std::cout << "Called ~Observation" << std::endl; };
***************
*** 589,592 ****
--- 673,681 ----
};
+ 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
***************
*** 597,600 ****
--- 686,691 ----
{
public:
+ static const std::string GUID;
+ BSUtilities::AutoRegistor<Compound> reg;
virtual ~Compound()
{
***************
*** 735,738 ****
--- 826,830 ----
std::vector<Experiment* > elements;
};
+ const std::string Compound::GUID = "Compound";
//! Class for collection of experiments.
***************
*** 747,751 ****
virtual ~Collection() {};
// No restricton on add, just inherit the one from Compound
!
private:
friend class boost::serialization::access;
--- 839,844 ----
virtual ~Collection() {};
// No restricton on add, just inherit the one from Compound
! static const std::string GUID;
! BSUtilities::AutoRegistor<Collection> reg;
private:
friend class boost::serialization::access;
***************
*** 756,759 ****
--- 849,853 ----
}
};
+ const std::string Collection::GUID = "Collection";
//! Class for homogeneous composition of experiments.
***************
*** 768,771 ****
--- 862,867 ----
{
public:
+ static const std::string GUID;
+ BSUtilities::AutoRegistor<Homogeneous> reg;
virtual ~Homogeneous() {};
void add(Experiment* e)
***************
*** 805,808 ****
--- 901,905 ----
}
};
+ const std::string Homogeneous::GUID = "Homogeneous";
//! Class for sequential composition of experiments.
***************
*** 815,818 ****
--- 912,917 ----
{
public:
+ static const std::string GUID;
+ BSUtilities::AutoRegistor<Sequential> reg;
virtual ~Sequential() {};
void add(Experiment* e)
***************
*** 834,837 ****
--- 933,937 ----
}
};
+ const std::string Sequential::GUID = "Sequential";
//! Class for simultaneous composition of experiments.
***************
*** 844,847 ****
--- 944,949 ----
{
public:
+ static const std::string GUID;
+ BSUtilities::AutoRegistor<Simultaneous> reg;
virtual ~Simultaneous() {};
void add(Experiment* e)
***************
*** 866,873 ****
}
};
namespace cv
{
! typedef TechniqueType<realism::Real,
dynamics::Dynamic,
quantity::Time,
--- 968,976 ----
}
};
+ const std::string Simultaneous::GUID = "Simultaneous";
namespace cv
{
! typedef Technique<realism::Real,
dynamics::Dynamic,
quantity::Time,
***************
*** 876,880 ****
ExcitationFunctions::Segments::LinearSegment>
RealDynamicTech;
! typedef TechniqueType<realism::Simulated,
dynamics::Dynamic,
quantity::Time,
--- 979,983 ----
ExcitationFunctions::Segments::LinearSegment>
RealDynamicTech;
! typedef Technique<realism::Simulated,
dynamics::Dynamic,
quantity::Time,
***************
*** 883,887 ****
ExcitationFunctions::Segments::LinearSegment>
SimulatedDynamicTech;
! typedef TechniqueType<realism::Dual,
dynamics::Dynamic,
quantity::Time,
--- 986,990 ----
ExcitationFunctions::Segments::LinearSegment>
SimulatedDynamicTech;
! typedef Technique<realism::Dual,
dynamics::Dynamic,
quantity::Time,
***************
*** 894,898 ****
namespace internal{
// for internal testing of experiment classes, do not use
! typedef TechniqueType<realism::Real,
dynamics::Dynamic,
quantity::Time,
--- 997,1001 ----
namespace internal{
// for internal testing of experiment classes, do not use
! typedef Technique<realism::Real,
dynamics::Dynamic,
quantity::Time,
***************
*** 901,905 ****
ExcitationFunctions::Segments::LinearSegment>
AT1;
! typedef TechniqueType<realism::Simulated,
dynamics::Dynamic,
quantity::Time,
--- 1004,1008 ----
ExcitationFunctions::Segments::LinearSegment>
AT1;
! typedef Technique<realism::Simulated,
dynamics::Dynamic,
quantity::Time,
***************
*** 908,912 ****
ExcitationFunctions::Segments::LinearSegment>
AT2;
! typedef TechniqueType<realism::Dual,
dynamics::Dynamic,
quantity::Time,
--- 1011,1015 ----
ExcitationFunctions::Segments::LinearSegment>
AT2;
! typedef Technique<realism::Dual,
dynamics::Dynamic,
quantity::Time,
***************
*** 915,919 ****
ExcitationFunctions::Segments::LinearSegment>
AT3;
! typedef TechniqueType<realism::Real,
dynamics::Static,
quantity::Time,
--- 1018,1022 ----
ExcitationFunctions::Segments::LinearSegment>
AT3;
! typedef Technique<realism::Real,
dynamics::Static,
quantity::Time,
***************
*** 922,926 ****
ExcitationFunctions::Segments::LinearSegment>
AT4;
! typedef TechniqueType<realism::Simulated,
dynamics::Static,
quantity::Time,
--- 1025,1029 ----
ExcitationFunctions::Segments::LinearSegment>
AT4;
! typedef Technique<realism::Simulated,
dynamics::Static,
quantity::Time,
***************
*** 929,933 ****
ExcitationFunctions::Segments::LinearSegment>
AT5;
! typedef TechniqueType<realism::Dual,
dynamics::Static,
quantity::Time,
--- 1032,1036 ----
ExcitationFunctions::Segments::LinearSegment>
AT5;
! typedef Technique<realism::Dual,
dynamics::Static,
quantity::Time,
***************
*** 936,940 ****
ExcitationFunctions::Segments::LinearSegment>
AT6;
! typedef TechniqueType<realism::Real,
dynamics::Dynamic,
quantity::CelsiusTemperature,
--- 1039,1043 ----
ExcitationFunctions::Segments::LinearSegment>
AT6;
! typedef Technique<realism::Real,
dynamics::Dynamic,
quantity::CelsiusTemperature,
***************
*** 943,947 ****
ExcitationFunctions::Segments::LinearSegment>
AT7;
! typedef TechniqueType<realism::Real,
dynamics::Dynamic,
quantity::Time,
--- 1046,1050 ----
ExcitationFunctions::Segments::LinearSegment>
AT7;
! typedef Technique<realism::Real,
dynamics::Dynamic,
quantity::Time,
***************
*** 950,954 ****
ExcitationFunctions::Segments::LinearSegment>
AT8;
! typedef TechniqueType<realism::Real,
dynamics::Dynamic,
quantity::Time,
--- 1053,1057 ----
ExcitationFunctions::Segments::LinearSegment>
AT8;
! typedef Technique<realism::Real,
dynamics::Dynamic,
quantity::Time,
***************
*** 957,961 ****
BSUtilities::EmptyTemplate_2>
OT1;
! typedef TechniqueType<realism::Simulated,
dynamics::Dynamic,
quantity::Time,
--- 1060,1064 ----
BSUtilities::EmptyTemplate_2>
OT1;
! typedef Technique<realism::Simulated,
dynamics::Dynamic,
quantity::Time,
***************
*** 964,968 ****
BSUtilities::EmptyTemplate_2>
OT2;
! typedef TechniqueType<realism::Dual,
dynamics::Dynamic,
quantity::Time,
--- 1067,1071 ----
BSUtilities::EmptyTemplate_2>
OT2;
! typedef Technique<realism::Dual,
dynamics::Dynamic,
quantity::Time,
***************
*** 971,975 ****
ExcitationFunctions::Segments::LinearSegment>
OT3;
! typedef TechniqueType<realism::Real,
dynamics::Dynamic,
quantity::Time,
--- 1074,1078 ----
ExcitationFunctions::Segments::LinearSegment>
OT3;
! typedef Technique<realism::Real,
dynamics::Dynamic,
quantity::Time,
***************
*** 978,982 ****
ExcitationFunctions::Segments::LinearSegment>
IT1;
! typedef TechniqueType<realism::Simulated,
dynamics::Dynamic,
quantity::Time,
--- 1081,1085 ----
ExcitationFunctions::Segments::LinearSegment>
IT1;
! typedef Technique<realism::Simulated,
dynamics::Dynamic,
quantity::Time,
***************
*** 985,989 ****
ExcitationFunctions::Segments::LinearSegment>
IT2;
! typedef TechniqueType<realism::Dual,
dynamics::Dynamic,
quantity::Time,
--- 1088,1092 ----
ExcitationFunctions::Segments::LinearSegment>
IT2;
! typedef Technique<realism::Dual,
dynamics::Dynamic,
quantity::Time,
***************
*** 1016,1056 ****
} // end namespace experiment
! BOOST_IS_ABSTRACT(experiment::Experiment)
! BOOST_IS_ABSTRACT(experiment::RealDynamicAtomic)
! BOOST_IS_ABSTRACT(experiment::RealStaticAtomic)
! BOOST_IS_ABSTRACT(experiment::SimulatedDynamicAtomic)
! BOOST_IS_ABSTRACT(experiment::SimulatedStaticAtomic)
! BOOST_IS_ABSTRACT(experiment::DualDynamicAtomic)
! BOOST_IS_ABSTRACT(experiment::DualStaticAtomic)
! BOOST_CLASS_EXPORT_GUID(experiment::Experiment, "experiment::Experiment")
! BOOST_CLASS_EXPORT_GUID(experiment::RealDynamicAtomic,
! "experiment::RealDynamicAtomic")
! BOOST_CLASS_EXPORT_GUID(experiment::RealStaticAtomic,
! "experiment::RealDynamicAtomic")
! BOOST_CLASS_EXPORT_GUID(experiment::SimulatedDynamicAtomic,
! "experiment::RealDynamicAtomic")
! BOOST_CLASS_EXPORT_GUID(experiment::SimulatedStaticAtomic,
! "experiment::RealDynamicAtomic")
! BOOST_CLASS_EXPORT_GUID(experiment::DualDynamicAtomic,
! "experiment::RealDynamicAtomic")
! BOOST_CLASS_EXPORT_GUID(experiment::DualStaticAtomic,
! "experiment::RealDynamicAtomic")
! BOOST_CLASS_EXPORT(experiment::RealDynamicEPTAction)
! BOOST_CLASS_EXPORT(experiment::SimulatedDynamicEPTAction)
! BOOST_CLASS_EXPORT(experiment::DualDynamicEPTAction)
! BOOST_CLASS_EXPORT(experiment::RealStaticEPTAction)
! BOOST_CLASS_EXPORT(experiment::SimulatedStaticEPTAction)
! BOOST_CLASS_EXPORT(experiment::DualStaticEPTAction)
! BOOST_CLASS_EXPORT(experiment::RealDynamicEPTempAction)
! BOOST_CLASS_EXPORT(experiment::RealDynamicECTAction)
! BOOST_CLASS_EXPORT(experiment::RealDynamicTEPObservation)
! BOOST_CLASS_EXPORT(experiment::RealDynamicEPTInduced)
! BOOST_CLASS_EXPORT_GUID(experiment::Compound, "experiment::Compound")
! BOOST_CLASS_EXPORT_GUID(experiment::Collection, "experiment::Collection")
! BOOST_CLASS_EXPORT_GUID(experiment::Homogeneous, "experiment::Homogeneous")
! BOOST_CLASS_EXPORT_GUID(experiment::Sequential, "experiment::Sequential")
! BOOST_CLASS_EXPORT_GUID(experiment::Simultaneous, "experiment::Simultaneous")
#endif
--- 1119,1169 ----
} // end namespace experiment
! // namespace boost{
! // namespace serialization{
! // template<>
! // struct is_abstract<experiment::Experiment>
! // {
! // typedef mpl::bool_<true> type;
! // BOOST_STATIC_CONSTANT(bool, value = true);
! // };
! // }
! // }
! // BOOST_IS_ABSTRACT(experiment::Experiment)
! // BOOST_IS_ABSTRACT(experiment::RealDynamicAtomic)
! // BOOST_IS_ABSTRACT(experiment::RealStaticAtomic)
! // BOOST_IS_ABSTRACT(experiment::SimulatedDynamicAtomic)
! // BOOST_IS_ABSTRACT(experiment::SimulatedStaticAtomic)
! // BOOST_IS_ABSTRACT(experiment::DualDynamicAtomic)
! // BOOST_IS_ABSTRACT(experiment::DualStaticAtomic)
! // BOOST_CLASS_EXPORT_GUID(experiment::Experiment, "experiment::Experiment")
! // BOOST_CLASS_EXPORT_GUID(experiment::RealDynamicAtomic,
! // "experiment::RealDynamicAtomic")
! // BOOST_CLASS_EXPORT_GUID(experiment::RealStaticAtomic,
! // "experiment::RealDynamicAtomic")
! // BOOST_CLASS_EXPORT_GUID(experiment::SimulatedDynamicAtomic,
! // "experiment::RealDynamicAtomic")
! // BOOST_CLASS_EXPORT_GUID(experiment::SimulatedStaticAtomic,
! // "experiment::RealDynamicAtomic")
! // BOOST_CLASS_EXPORT_GUID(experiment::DualDynamicAtomic,
! // "experiment::RealDynamicAtomic")
! // BOOST_CLASS_EXPORT_GUID(experiment::DualStaticAtomic,
! // "experiment::RealDynamicAtomic")
! // BOOST_CLASS_EXPORT(experiment::RealDynamicEPTAction)
! // BOOST_CLASS_EXPORT(experiment::SimulatedDynamicEPTAction)
! // BOOST_CLASS_EXPORT(experiment::DualDynamicEPTAction)
! // BOOST_CLASS_EXPORT(experiment::RealStaticEPTAction)
! // BOOST_CLASS_EXPORT(experiment::SimulatedStaticEPTAction)
! // BOOST_CLASS_EXPORT(experiment::DualStaticEPTAction)
! // BOOST_CLASS_EXPORT(experiment::RealDynamicEPTempAction)
! // BOOST_CLASS_EXPORT(experiment::RealDynamicECTAction)
! // BOOST_CLASS_EXPORT(experiment::RealDynamicTEPObservation)
! // BOOST_CLASS_EXPORT(experiment::RealDynamicEPTInduced)
! // BOOST_CLASS_EXPORT_GUID(experiment::Compound, "experiment::Compound")
! // BOOST_CLASS_EXPORT_GUID(experiment::Collection, "experiment::Collection")
! // BOOST_CLASS_EXPORT_GUID(experiment::Homogeneous, "experiment::Homogeneous")
! // BOOST_CLASS_EXPORT_GUID(experiment::Sequential, "experiment::Sequential")
! // BOOST_CLASS_EXPORT_GUID(experiment::Simultaneous, "experiment::Simultaneous")
#endif
|
|
From: beeblbrox <bee...@us...> - 2007-05-17 14:02:50
|
Update of /cvsroot/echempp/Experiment/Experiment/test
In directory sc8-pr-cvs17:/tmp/cvs-serv5900/test
Modified Files:
ExperimentTest.cpp
Log Message:
Added new auto-registration mechanism. SerializationTools.h is assumed
to used static const std::string GUID of each class, where this variable
is initialized via create_guid.
TechniqueType shortened to Technique.
Index: ExperimentTest.cpp
===================================================================
RCS file: /cvsroot/echempp/Experiment/Experiment/test/ExperimentTest.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ExperimentTest.cpp 5 May 2007 08:49:07 -0000 1.6
--- ExperimentTest.cpp 17 May 2007 14:02:42 -0000 1.7
***************
*** 385,388 ****
--- 385,389 ----
// Polymorphic Action serialization
+ std::cout << "Polymorphic Action serialization...";
{
ep = new RealDynamicEPTAction();
***************
*** 391,396 ****
--- 392,399 ----
delete ep;
}
+ std::cout << "done." << std::endl;
// Polymorphic Induced serialization
+ std::cout << "Polymorphic Induced serialization...";
{
ep = new RealDynamicEPTInduced();
***************
*** 399,404 ****
--- 402,409 ----
delete ep;
}
+ std::cout << "done." << std::endl;
// Polymorphic Observation serialization
+ std::cout << "Polymorphic Observation serialization...";
{
ep = new RealDynamicTEPObservation();
***************
*** 407,412 ****
--- 412,419 ----
delete ep;
}
+ std::cout << "done." << std::endl;
// Polymorphic Homogeneous serialization
+ std::cout << "Polymorphic Homogeneous serialization...";
{
ep = create_homogeneous();
***************
*** 415,420 ****
--- 422,429 ----
delete ep;
}
+ std::cout << "done." << std::endl;
// Polymorphic Sequential serialization
+ std::cout << "Polymorphic Sequential serialization...";
{
ep = create_sequential();
***************
*** 423,428 ****
--- 432,439 ----
delete ep;
}
+ std::cout << "done." << std::endl;
// Polymorphic Simultaneous serialization
+ std::cout << "Polymorphic Simultaneous serialization...";
{
ep = create_simultaneous();
***************
*** 431,436 ****
--- 442,449 ----
delete ep;
}
+ std::cout << "done." << std::endl;
// Polymorphic Collection serialization
+ std::cout << "Polymorphic Collection serialization...";
{
ep = create_collection();
***************
*** 439,442 ****
--- 452,456 ----
delete ep;
}
+ std::cout << "done." << std::endl;
}
|
|
From: Bernd S. <ber...@us...> - 2007-05-15 14:10:49
|
Update of /cvsroot/echempp/Experiment/ExcitationFunction/test
In directory sc8-pr-cvs17:/tmp/cvs-serv26154/Experiment/ExcitationFunction/test
Modified Files:
excitationFunctionTest.cpp
Log Message:
testing xml input failure
Index: excitationFunctionTest.cpp
===================================================================
RCS file: /cvsroot/echempp/Experiment/ExcitationFunction/test/excitationFunctionTest.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** excitationFunctionTest.cpp 14 May 2007 19:18:14 -0000 1.22
--- excitationFunctionTest.cpp 15 May 2007 14:10:45 -0000 1.23
***************
*** 1020,1024 ****
--- 1020,1026 ----
TiXmlHandle root = BSUtilities::xmlr::xmlInit (xmlsave_ef_filename);
+ std::cout << " root generated!" << std::endl;
cv_xmlload.load (root);
+ std::cout << " root finished!" << std::endl;
BSUtilities::xmlr::xmlFinish (root);
std::cout << " file `" << xmlsave_ef_filename
|
|
From: Bernd S. <ber...@us...> - 2007-05-15 14:10:49
|
Update of /cvsroot/echempp/Experiment/ExcitationFunction
In directory sc8-pr-cvs17:/tmp/cvs-serv26154/Experiment/ExcitationFunction
Modified Files:
excitationFunction.hpp segment.hpp
Log Message:
testing xml input failure
Index: excitationFunction.hpp
===================================================================
RCS file: /cvsroot/echempp/Experiment/ExcitationFunction/excitationFunction.hpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** excitationFunction.hpp 14 May 2007 19:18:14 -0000 1.37
--- excitationFunction.hpp 15 May 2007 14:10:45 -0000 1.38
***************
*** 328,338 ****
this->clear();
TiXmlElement *element = node.Element();
std::cout << " Tag zum Vergleich: `" << ExcitationFunction::TAG << "'" << std::endl;
! std::cout << " in ef load, TAG: `" << element->ValueStr () << "'" << std::endl;
! if (element && (element->ValueStr() == ExcitationFunction::TAG))
{
TiXmlNode *child = 0;
--- 328,349 ----
this->clear();
+ int i = node.Node()->Type();
+ std::cout << " type: " << i << "element type = " << TiXmlNode::ELEMENT << std::endl;
TiXmlElement *element = node.Element();
+ std::cout << "attribute segmentNumber: " << element->Attribute ("segmentNumber") << std::endl;
+ FILE *out1 = fopen ("outfile1", "w");
+ element->Print (out1, 1);
+ fclose (out1);
std::cout << " Tag zum Vergleich: `" << ExcitationFunction::TAG << "'" << std::endl;
! //std::cout << " in ef load, TAG: `" << element->ValueStr () << "'" << std::endl;
! if (element )
! {
! /*
! if (element->ValueStr() == ExcitationFunction::TAG)
{
+ */
+ std::cout << "in element" << std::endl;
TiXmlNode *child = 0;
***************
*** 340,346 ****
--- 351,359 ----
(Segments::Segment::TAG, child)))
{
+ std::cout << "in child" << std::endl;
if ((child->ToElement ())->Attribute
(Segments::Segment::IDTAG))
{
+ std::cout << "in attribute" << std::endl;
Segments::DISegment<D, I> *new_segment
= Segments::DISegment<D, I>::Factory::Instance().
***************
*** 353,356 ****
--- 366,370 ----
}
}
+ // }
}
else
***************
*** 882,889 ****
this->clear();
TiXmlElement *element = node.Element();
std::cout << " Tag zum Vergleich: `" << ExcitationFunction::TAG << "'" << std::endl;
! std::cout << " in sd_ef load, TAG: `" << element->ValueStr () << "'" << std::endl;
if (element && (element->ValueStr() == ExcitationFunction::TAG))
{
--- 896,909 ----
this->clear();
+ int i = node.Node()->Type();
+ std::cout << " type: " << i << "element type = " << TiXmlNode::ELEMENT << std::endl;
TiXmlElement *element = node.Element();
+ std::cout << "attribute segmentNumber: " << element->Attribute ("segmentNumber") << std::endl;
+ FILE *out = fopen ("outfile", "w");
+ element->Print (out, 1);
+ fclose (out);
std::cout << " Tag zum Vergleich: `" << ExcitationFunction::TAG << "'" << std::endl;
! //std::cout << " in sd_ef load, TAG: `" << element->ValueStr () << "'" << std::endl;
if (element && (element->ValueStr() == ExcitationFunction::TAG))
{
Index: segment.hpp
===================================================================
RCS file: /cvsroot/echempp/Experiment/ExcitationFunction/segment.hpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** segment.hpp 17 Feb 2007 16:03:21 -0000 1.35
--- segment.hpp 15 May 2007 14:10:45 -0000 1.36
***************
*** 461,470 ****
--- 461,479 ----
void load (const TiXmlHandle node)
{
+ int i = node.Node()->Type();
+ std::cout << " type: " << i << "element type = " << TiXmlNode::ELEMENT << std::endl;
+
TiXmlElement *element = node.Element();
+ std::cout << " Tag zum Vergleich: `" << Segment::TAG << "'" << std::endl;
+
+
+ // commented for testing
+ /*
if (element
&& (element->ValueStr () == Segment::TAG)
&& (element->Attribute(Segment::IDTAG) == ID))
{
+ */
if (element->Attribute(STARTINGVALUE) &&
element->Attribute(STARTINGUNIT))
***************
*** 493,500 ****
--- 502,512 ----
_derivative = (_endValue - _startingValue)/DISegment<D,I>::_Imax;
+ // commented for testing
+ /*
}
else
throw LoadError
("error loading linear segment: incorrect element");
+ */
}
***************
*** 716,723 ****
--- 728,738 ----
{
TiXmlElement *element = node.Element();
+ // commented for testing
+ /*
if (element
&& (element->ValueStr () == Segment::TAG)
&& (element->Attribute(Segment::IDTAG) == ID))
{
+ */
if (element->Attribute(CONSTANTVALUE) &&
element->Attribute(CONSTANTUNIT))
***************
*** 736,740 ****
DISegment<D,I>::_Imax = val;
}
!
}
--- 751,756 ----
DISegment<D,I>::_Imax = val;
}
! // commented for testing
! /*
}
***************
*** 742,745 ****
--- 758,762 ----
throw LoadError
("error loading constant segment: incorrect element");
+ */
}
|
|
From: Bernd S. <ber...@us...> - 2007-05-14 19:18:25
|
Update of /cvsroot/echempp/Experiment/ExcitationFunction
In directory sc8-pr-cvs17:/tmp/cvs-serv21672/Experiment/ExcitationFunction
Modified Files:
excitationFunction.hpp
Log Message:
checking xml problem
Index: excitationFunction.hpp
===================================================================
RCS file: /cvsroot/echempp/Experiment/ExcitationFunction/excitationFunction.hpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** excitationFunction.hpp 14 May 2007 15:38:19 -0000 1.36
--- excitationFunction.hpp 14 May 2007 19:18:14 -0000 1.37
***************
*** 331,335 ****
std::cout << " Tag zum Vergleich: `" << ExcitationFunction::TAG << "'" << std::endl;
! std::cout << " in ef load, TAG: `" << element->ValueStr () << std::endl;
if (element && (element->ValueStr() == ExcitationFunction::TAG))
--- 331,335 ----
std::cout << " Tag zum Vergleich: `" << ExcitationFunction::TAG << "'" << std::endl;
! std::cout << " in ef load, TAG: `" << element->ValueStr () << "'" << std::endl;
if (element && (element->ValueStr() == ExcitationFunction::TAG))
***************
*** 885,890 ****
std::cout << " Tag zum Vergleich: `" << ExcitationFunction::TAG << "'" << std::endl;
! //std::cout << " in sd_ef load, TAG: `" << element->ValueStr () << std::endl;
! if (element && (element->ValueStr() == Segments::Segment::TAG))
{
TiXmlNode *child = 0;
--- 885,890 ----
std::cout << " Tag zum Vergleich: `" << ExcitationFunction::TAG << "'" << std::endl;
! std::cout << " in sd_ef load, TAG: `" << element->ValueStr () << "'" << std::endl;
! if (element && (element->ValueStr() == ExcitationFunction::TAG))
{
TiXmlNode *child = 0;
|
|
From: Bernd S. <ber...@us...> - 2007-05-14 19:18:24
|
Update of /cvsroot/echempp/Experiment/ExcitationFunction/test
In directory sc8-pr-cvs17:/tmp/cvs-serv21672/Experiment/ExcitationFunction/test
Modified Files:
excitationFunctionTest.cpp
Log Message:
checking xml problem
Index: excitationFunctionTest.cpp
===================================================================
RCS file: /cvsroot/echempp/Experiment/ExcitationFunction/test/excitationFunctionTest.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** excitationFunctionTest.cpp 14 May 2007 15:38:19 -0000 1.21
--- excitationFunctionTest.cpp 14 May 2007 19:18:14 -0000 1.22
***************
*** 1013,1018 ****
<< std::endl;
CVExcitationFunction cv_xmlload;
std::cout << " CVExcitationFunction object generated!" << std::endl;
! /*
try {
TiXmlHandle root = BSUtilities::xmlr::xmlInit (xmlsave_ef_filename);
--- 1013,1020 ----
<< std::endl;
CVExcitationFunction cv_xmlload;
+
+ // only for testing
std::cout << " CVExcitationFunction object generated!" << std::endl;
!
try {
TiXmlHandle root = BSUtilities::xmlr::xmlInit (xmlsave_ef_filename);
***************
*** 1033,1037 ****
<< " (expect: " << CV3.maximum () << ")" << std::endl;
std::cout << std::endl;
- */
EtExcitationFunction et_xmlsave (HR);
--- 1035,1038 ----
|