Changes in / [45f835:9c27b0]
- Files:
-
- 492 added
- 167 deleted
- 86 edited
Legend:
- Unmodified
- Added
- Removed
-
configure.ac
r45f835 r9c27b0 137 137 138 138 139 # CodePatterns library (needs Observer::Channels)140 AM_PATH_CODEPATTERNS([1.1. 5], $have_debug,,[AC_MSG_ERROR([Missing CodePatterns library, please specify PKG_CONFIG_PATH or use --with-codepatterns...])])139 # CodePatterns library (needs valarray in MemDebug ) 140 AM_PATH_CODEPATTERNS([1.1.6], $have_debug,,[AC_MSG_ERROR([Missing CodePatterns library, please specify PKG_CONFIG_PATH or use --with-codepatterns...])]) 141 141 142 142 # Checks for header files. … … 218 218 219 219 # test suite 220 220 221 AC_CONFIG_FILES([ 221 222 tests/Makefile]) … … 230 231 tests/Fragmentations/atlocal 231 232 tests/Fragmentations/Makefile]) 233 AC_CONFIG_FILES([tests/Fragmentations/analyzer], [chmod +x tests/Fragmentations/analyzer]) 234 AC_CONFIG_FILES([tests/Fragmentations/joiner], [chmod +x tests/Fragmentations/joiner]) 232 235 AC_CONFIG_FILES([tests/Fragmentations/molecuilder], [chmod +x tests/Fragmentations/molecuilder]) 233 236 … … 247 250 doc/molecuilder.xml]) 248 251 AC_CONFIG_FILES([ 249 252 MoleCuilder.pc:MoleCuilder.pc.in]) 250 253 AC_CONFIG_FILES([ 251 254 Makefile … … 254 257 ]) 255 258 AC_CONFIG_FILES([ 256 259 src/unittests/Makefile 257 260 ]) 258 261 AC_OUTPUT -
src/Actions/AnalysisAction/DipoleAngularCorrelationAction.cpp
r45f835 r9c27b0 20 20 #include "CodePatterns/MemDebug.hpp" 21 21 22 #include " analysis_correlation.hpp"23 #include " boundary.hpp"22 #include "Analysis/analysis_correlation.hpp" 23 #include "Tesselation/boundary.hpp" 24 24 #include "linkedcell.hpp" 25 25 #include "CodePatterns/Verbose.hpp" 26 26 #include "CodePatterns/Log.hpp" 27 #include " element.hpp"27 #include "Element/element.hpp" 28 28 #include "molecule.hpp" 29 #include " periodentafel.hpp"29 #include "Element/periodentafel.hpp" 30 30 #include "LinearAlgebra/Vector.hpp" 31 31 #include "World.hpp" -
src/Actions/AnalysisAction/MolecularVolumeAction.cpp
r45f835 r9c27b0 20 20 #include "CodePatterns/MemDebug.hpp" 21 21 22 #include " boundary.hpp"22 #include "Tesselation/boundary.hpp" 23 23 #include "config.hpp" 24 24 #include "molecule.hpp" … … 27 27 #include "CodePatterns/Verbose.hpp" 28 28 #include "PointCloudAdaptor.hpp" 29 #include " tesselation.hpp"29 #include "Tesselation/tesselation.hpp" 30 30 #include "World.hpp" 31 31 -
src/Actions/AnalysisAction/PairCorrelationAction.cpp
r45f835 r9c27b0 20 20 #include "CodePatterns/MemDebug.hpp" 21 21 22 #include " analysis_correlation.hpp"23 #include " boundary.hpp"22 #include "Analysis/analysis_correlation.hpp" 23 #include "Tesselation/boundary.hpp" 24 24 #include "linkedcell.hpp" 25 25 #include "CodePatterns/Verbose.hpp" 26 26 #include "CodePatterns/Log.hpp" 27 #include " element.hpp"27 #include "Element/element.hpp" 28 28 #include "molecule.hpp" 29 #include " periodentafel.hpp"29 #include "Element/periodentafel.hpp" 30 30 #include "LinearAlgebra/Vector.hpp" 31 31 #include "World.hpp" -
src/Actions/AnalysisAction/PointCorrelationAction.cpp
r45f835 r9c27b0 20 20 #include "CodePatterns/MemDebug.hpp" 21 21 22 #include " analysis_correlation.hpp"23 #include " boundary.hpp"22 #include "Analysis/analysis_correlation.hpp" 23 #include "Tesselation/boundary.hpp" 24 24 #include "linkedcell.hpp" 25 25 #include "CodePatterns/Verbose.hpp" 26 26 #include "CodePatterns/Log.hpp" 27 #include " element.hpp"27 #include "Element/element.hpp" 28 28 #include "molecule.hpp" 29 #include " periodentafel.hpp"29 #include "Element/periodentafel.hpp" 30 30 #include "LinearAlgebra/Vector.hpp" 31 31 #include "World.hpp" -
src/Actions/AnalysisAction/PrincipalAxisSystemAction.cpp
r45f835 r9c27b0 24 24 #include "LinearAlgebra/RealSpaceMatrix.hpp" 25 25 #include "LinearAlgebra/Vector.hpp" 26 #include " element.hpp"26 #include "Element/element.hpp" 27 27 #include "molecule.hpp" 28 28 -
src/Actions/AnalysisAction/SurfaceCorrelationAction.cpp
r45f835 r9c27b0 20 20 #include "CodePatterns/MemDebug.hpp" 21 21 22 #include " analysis_correlation.hpp"23 #include " boundary.hpp"22 #include "Analysis/analysis_correlation.hpp" 23 #include "Tesselation/boundary.hpp" 24 24 #include "linkedcell.hpp" 25 25 #include "CodePatterns/Verbose.hpp" 26 26 #include "CodePatterns/Log.hpp" 27 27 #include "Descriptors/MoleculeIdDescriptor.hpp" 28 #include " element.hpp"28 #include "Element/element.hpp" 29 29 #include "LinearAlgebra/Vector.hpp" 30 30 #include "molecule.hpp" 31 #include " periodentafel.hpp"31 #include "Element/periodentafel.hpp" 32 32 #include "PointCloudAdaptor.hpp" 33 #include " tesselation.hpp"33 #include "Tesselation/tesselation.hpp" 34 34 #include "World.hpp" 35 35 -
src/Actions/AtomAction/AddAction.cpp
r45f835 r9c27b0 22 22 #include "Descriptors/AtomIdDescriptor.hpp" 23 23 #include "atom.hpp" 24 #include " element.hpp"24 #include "Element/element.hpp" 25 25 #include "CodePatterns/Log.hpp" 26 26 #include "molecule.hpp" -
src/Actions/AtomAction/ChangeElementAction.cpp
r45f835 r9c27b0 22 22 #include "Descriptors/AtomIdDescriptor.hpp" 23 23 #include "atom.hpp" 24 #include " element.hpp"24 #include "Element/element.hpp" 25 25 #include "CodePatterns/Log.hpp" 26 26 #include "LinearAlgebra/Vector.hpp" -
src/Actions/CommandAction/BondLengthTableAction.cpp
r45f835 r9c27b0 17 17 #include <config.h> 18 18 #endif 19 20 // include headers that implement a archive in simple text format 21 #include <boost/archive/text_oarchive.hpp> 22 #include <boost/archive/text_iarchive.hpp> 19 23 20 24 #include "CodePatterns/MemDebug.hpp" … … 44 48 45 49 DoLog(0) && (Log() << Verbose(0) << "Using " << params.BondGraphFileName << " as bond length table." << endl); 46 config *configuration = World::getInstance().getConfig(); 47 BondGraph *OldBG = World::getInstance().getBondGraph(); 50 BondGraph *&BG = World::getInstance().getBondGraph(); 48 51 49 BondGraph *BG = new BondGraph(configuration->GetIsAngstroem()); 52 // create undo state 53 std::stringstream undostream; 54 boost::archive::text_oarchive oa(undostream); 55 oa << BG; 56 CommandBondLengthTableState *UndoState = 57 new CommandBondLengthTableState( 58 undostream.str(), 59 params 60 ); 61 62 BG->CleanupBondLengthTable(); 50 63 if ((!params.BondGraphFileName.empty()) 51 64 && boost::filesystem::exists(params.BondGraphFileName)) { … … 54 67 DoLog(0) && (Log() << Verbose(0) << "Bond length table parsed successfully." << endl); 55 68 input.close(); 56 CommandBondLengthTableState *state = new CommandBondLengthTableState(*OldBG, params); 57 World::getInstance().setBondGraph(BG); // Changes OldBG, hence have to copy beforehand 58 return Action::state_ptr(state); 69 return Action::state_ptr(UndoState); 59 70 } else { 60 71 DoeLog(1) && (eLog()<< Verbose(1) << "Bond length table parsing failed." << endl); 61 72 input.close(); 62 return Action::failure;63 73 } 64 74 } else { 65 75 DoeLog(1) && (eLog()<< Verbose(1) << "Bond length table loading failed." << endl); 66 return Action::failure;67 76 } 77 // recover bond graph 78 boost::archive::text_iarchive ia(undostream); 79 delete BG; 80 ia >> BG; 81 delete UndoState; 82 return Action::failure; 68 83 } 69 84 … … 71 86 CommandBondLengthTableState *state = assert_cast<CommandBondLengthTableState*>(_state.get()); 72 87 73 BondGraph *OldBG = World::getInstance().getBondGraph(); 74 CommandBondLengthTableState *restate = new CommandBondLengthTableState(*OldBG, params); 75 World::getInstance().setBondGraph(new BondGraph(state->OldBG)); // Changes OldBG, hence have to copy beforehand 88 BondGraph *BG; 89 std::stringstream undostream(state->undostring); 90 boost::archive::text_iarchive ia(undostream); 91 ia >> BG; 92 World::getInstance().setBondGraph(BG); 76 93 77 return Action::state_ptr( restate);94 return Action::state_ptr(_state); 78 95 } 79 96 … … 81 98 CommandBondLengthTableState *state = assert_cast<CommandBondLengthTableState*>(_state.get()); 82 99 83 BondGraph *OldBG = World::getInstance().getBondGraph(); 84 CommandBondLengthTableState *restate = new CommandBondLengthTableState(*OldBG, params); 85 World::getInstance().setBondGraph(new BondGraph(state->OldBG)); // Changes OldBG, hence have to copy beforehand 100 BondGraph *&BG = World::getInstance().getBondGraph(); 101 BG->CleanupBondLengthTable(); 102 std::ifstream input(state->params.BondGraphFileName.string().c_str()); 103 if ((input.good()) && (BG->LoadBondLengthTable(input))) { 104 DoLog(0) && (Log() << Verbose(0) << "Bond length table parsed successfully." << endl); 105 input.close(); 106 } 86 107 87 return Action::state_ptr( restate);108 return Action::state_ptr(_state); 88 109 } 89 110 90 111 bool CommandBondLengthTableAction::canUndo() { 91 return false;112 return true; 92 113 } 93 114 94 115 bool CommandBondLengthTableAction::shouldUndo() { 95 return false;116 return true; 96 117 } 97 118 /** =========== end of function ====================== */ -
src/Actions/CommandAction/BondLengthTableAction.def
r45f835 r9c27b0 19 19 #define paramreferences (BondGraphFileName) 20 20 21 #define statetypes ( BondGraph)22 #define statereferences ( OldBG)21 #define statetypes (std::string) 22 #define statereferences (undostring) 23 23 24 24 // some defines for all the names, you may use ACTION, STATE and PARAMS -
src/Actions/CommandAction/ElementDbAction.cpp
r45f835 r9c27b0 25 25 26 26 #include "config.hpp" 27 #include " element.hpp" // we need element because of serialization!28 #include " periodentafel.hpp"27 #include "Element/element.hpp" // we need element because of serialization! 28 #include "Element/periodentafel.hpp" 29 29 #include "CodePatterns/Log.hpp" 30 30 #include "CodePatterns/Verbose.hpp" -
src/Actions/MoleculeAction/FillVoidWithMoleculeAction.cpp
r45f835 r9c27b0 22 22 #include "atom.hpp" 23 23 #include "Graph/BondGraph.hpp" 24 #include " boundary.hpp"24 #include "Tesselation/boundary.hpp" 25 25 #include "CodePatterns/Verbose.hpp" 26 26 #include "config.hpp" -
src/Actions/MoleculeAction/FillWithMoleculeAction.cpp
r45f835 r9c27b0 22 22 #include "atom.hpp" 23 23 #include "Graph/BondGraph.hpp" 24 #include " boundary.hpp"24 #include "Tesselation/boundary.hpp" 25 25 #include "CodePatterns/Verbose.hpp" 26 26 #include "config.hpp" -
src/Actions/MoleculeAction/RotateToPrincipalAxisSystemAction.cpp
r45f835 r9c27b0 25 25 #include "LinearAlgebra/RealSpaceMatrix.hpp" 26 26 #include "LinearAlgebra/Vector.hpp" 27 #include " element.hpp"27 #include "Element/element.hpp" 28 28 #include "molecule.hpp" 29 29 -
src/Actions/MoleculeAction/SuspendInWaterAction.cpp
r45f835 r9c27b0 20 20 #include "CodePatterns/MemDebug.hpp" 21 21 22 #include " boundary.hpp"22 #include "Tesselation/boundary.hpp" 23 23 #include "config.hpp" 24 24 #include "CodePatterns/Log.hpp" -
src/Actions/SelectionAction/Atoms/AtomByElementAction.cpp
r45f835 r9c27b0 23 23 #include "Descriptors/AtomSelectionDescriptor.hpp" 24 24 #include "atom.hpp" 25 #include " element.hpp"25 #include "Element/element.hpp" 26 26 #include "CodePatterns/Log.hpp" 27 27 #include "CodePatterns/Verbose.hpp" -
src/Actions/SelectionAction/Atoms/NotAtomByElementAction.cpp
r45f835 r9c27b0 23 23 #include "Descriptors/AtomTypeDescriptor.hpp" 24 24 #include "atom.hpp" 25 #include " element.hpp"25 #include "Element/element.hpp" 26 26 #include "CodePatterns/Log.hpp" 27 27 #include "CodePatterns/Verbose.hpp" -
src/Actions/TesselationAction/ConvexEnvelopeAction.cpp
r45f835 r9c27b0 20 20 #include "CodePatterns/MemDebug.hpp" 21 21 22 #include " boundary.hpp"22 #include "Tesselation/boundary.hpp" 23 23 #include "CodePatterns/Log.hpp" 24 24 #include "CodePatterns/Verbose.hpp" … … 27 27 #include "molecule.hpp" 28 28 #include "PointCloudAdaptor.hpp" 29 #include " tesselation.hpp"29 #include "Tesselation/tesselation.hpp" 30 30 #include "World.hpp" 31 31 -
src/Actions/TesselationAction/NonConvexEnvelopeAction.cpp
r45f835 r9c27b0 20 20 #include "CodePatterns/MemDebug.hpp" 21 21 22 #include " boundary.hpp"22 #include "Tesselation/boundary.hpp" 23 23 #include "CodePatterns/Log.hpp" 24 24 #include "CodePatterns/Verbose.hpp" … … 26 26 #include "molecule.hpp" 27 27 #include "PointCloudAdaptor.hpp" 28 #include " tesselation.hpp"28 #include "Tesselation/tesselation.hpp" 29 29 #include "World.hpp" 30 30 -
src/Actions/ValueStorage.cpp
r45f835 r9c27b0 37 37 #include "atom.hpp" 38 38 #include "Box.hpp" 39 #include " element.hpp"39 #include "Element/element.hpp" 40 40 #include "molecule.hpp" 41 #include " periodentafel.hpp"41 #include "Element/periodentafel.hpp" 42 42 #include "World.hpp" 43 43 -
src/AtomicInfo.cpp
r45f835 r9c27b0 22 22 #include "atom.hpp" 23 23 #include "AtomicInfo.hpp" 24 #include " element.hpp"24 #include "Element/element.hpp" 25 25 #include "LinearAlgebra/Vector.hpp" 26 26 -
src/Bond/bond.cpp
r45f835 r9c27b0 23 23 #include "atom.hpp" 24 24 #include "Bond/bond.hpp" 25 #include " element.hpp"25 #include "Element/element.hpp" 26 26 27 27 -
src/Descriptors/AtomTypeDescriptor.cpp
r45f835 r9c27b0 25 25 #include "atom.hpp" 26 26 #include "World.hpp" 27 #include " periodentafel.hpp"27 #include "Element/periodentafel.hpp" 28 28 29 29 AtomTypeDescriptor_impl::AtomTypeDescriptor_impl(const element* _type) : -
src/Dynamics/LinearInterpolationBetweenSteps.hpp
r45f835 r9c27b0 25 25 #include "Dynamics/MinimiseConstrainedPotential.hpp" 26 26 #include "molecule.hpp" 27 #include "parser.hpp"28 27 #include "World.hpp" 29 28 -
src/Dynamics/MinimiseConstrainedPotential.cpp
r45f835 r9c27b0 26 26 #include "atom.hpp" 27 27 #include "config.hpp" 28 #include " element.hpp"28 #include "Element/element.hpp" 29 29 #include "CodePatterns/enumeration.hpp" 30 30 #include "CodePatterns/Info.hpp" 31 31 #include "CodePatterns/Verbose.hpp" 32 32 #include "CodePatterns/Log.hpp" 33 #include "Fragmentation/ForceMatrix.hpp" 33 34 #include "Helpers/helpers.hpp" 34 35 #include "molecule.hpp" 35 #include "parser.hpp"36 36 #include "LinearAlgebra/Plane.hpp" 37 37 #include "World.hpp" -
src/Dynamics/VerletForceIntegration.hpp
r45f835 r9c27b0 21 21 #include "CodePatterns/Verbose.hpp" 22 22 #include "Dynamics/MinimiseConstrainedPotential.hpp" 23 #include "Fragmentation/ForceMatrix.hpp" 23 24 #include "Helpers/helpers.hpp" 24 25 #include "LinearAlgebra/Vector.hpp" 25 #include "parser.hpp"26 26 #include "ThermoStatContainer.hpp" 27 27 #include "Thermostats/Berendsen.hpp" -
src/Formula.cpp
r45f835 r9c27b0 25 25 26 26 #include "World.hpp" 27 #include " periodentafel.hpp"28 #include " element.hpp"27 #include "Element/periodentafel.hpp" 28 #include "Element/element.hpp" 29 29 #include "CodePatterns/Assert.hpp" 30 30 #include "CodePatterns/Range.hpp" -
src/Graph/BondGraph.cpp
r45f835 r9c27b0 26 26 #include "Graph/BondGraph.hpp" 27 27 #include "Box.hpp" 28 #include " element.hpp"28 #include "Element/element.hpp" 29 29 #include "CodePatterns/Info.hpp" 30 30 #include "CodePatterns/Log.hpp" … … 32 32 #include "CodePatterns/Verbose.hpp" 33 33 #include "molecule.hpp" 34 #include " parser.hpp"35 #include " periodentafel.hpp"34 #include "Element/periodentafel.hpp" 35 #include "Fragmentation/MatrixContainer.hpp" 36 36 #include "LinearAlgebra/Vector.hpp" 37 37 #include "World.hpp" … … 39 39 40 40 const double BondGraph::BondThreshold = 0.4; //!< CSD threshold in bond check which is the width of the interval whose center is the sum of the covalent radii 41 42 BondGraph::BondGraph() : 43 BondLengthMatrix(NULL), 44 IsAngstroem(true) 45 {} 41 46 42 47 BondGraph::BondGraph(bool IsA) : … … 47 52 BondGraph::~BondGraph() 48 53 { 54 CleanupBondLengthTable(); 55 } 56 57 void BondGraph::CleanupBondLengthTable() 58 { 49 59 if (BondLengthMatrix != NULL) { 50 60 delete(BondLengthMatrix); … … 63 73 LOG(1, "MatrixContainer for Bond length already present, removing."); 64 74 delete(BondLengthMatrix); 75 BondLengthMatrix = NULL; 65 76 } 66 77 TempContainer = new MatrixContainer; … … 222 233 } 223 234 235 bool BondGraph::operator==(const BondGraph &other) const 236 { 237 if (IsAngstroem != other.IsAngstroem) 238 return false; 239 if (((BondLengthMatrix != NULL) && (other.BondLengthMatrix == NULL)) 240 || ((BondLengthMatrix == NULL) && (other.BondLengthMatrix != NULL))) 241 return false; 242 if ((BondLengthMatrix != NULL) && (other.BondLengthMatrix != NULL)) 243 if (*BondLengthMatrix != *other.BondLengthMatrix) 244 return false; 245 return true; 246 } -
src/Graph/BondGraph.hpp
r45f835 r9c27b0 20 20 #include <iosfwd> 21 21 22 #include <boost/serialization/array.hpp> 23 22 24 #include "AtomSet.hpp" 23 25 #include "Bond/bond.hpp" … … 26 28 #include "CodePatterns/Range.hpp" 27 29 #include "CodePatterns/Verbose.hpp" 28 #include "element.hpp" 30 #include "Element/element.hpp" 31 #include "Fragmentation/MatrixContainer.hpp" 29 32 #include "linkedcell.hpp" 30 33 #include "IPointCloud.hpp" … … 65 68 */ 66 69 bool LoadBondLengthTable(std::istream &input); 70 71 /** Removes allocated bond length table. 72 * 73 */ 74 void CleanupBondLengthTable(); 67 75 68 76 /** Determines the maximum of all element::CovalentRadius for elements present in \a &Set. … … 300 308 } 301 309 310 /** Equality comparator for class BondGraph. 311 * 312 * @param other other instance to compare to 313 * @return true - if equal in every member variable, except static 314 * \a BondGraph::BondThreshold. 315 */ 316 bool operator==(const BondGraph &other) const; 317 318 /** Unequality comparator for class BondGraph. 319 * 320 * @param other other instance to compare to 321 * @return false - if equal in every member variable, except static 322 * \a BondGraph::BondThreshold. 323 */ 324 bool operator!=(const BondGraph &other) const { 325 return !(*this == other); 326 } 327 302 328 private: 303 static const double BondThreshold;304 329 305 330 /** Returns the BondLengthMatrix entry for a given index pair. … … 383 408 } 384 409 410 bool operator==(const periodentafel &other) const; 411 412 bool operator!=(const periodentafel &other) const { 413 return !(*this == other); 414 } 415 416 private: 417 // default constructor for serialization 418 BondGraph(); 419 420 friend class boost::serialization::access; 421 // serialization 422 template<class Archive> 423 void serialize(Archive & ar, const unsigned int version) 424 { 425 //ar & const_cast<double &>(BondThreshold); 426 ar & BondLengthMatrix; 427 ar & IsAngstroem; 428 } 429 430 //!> half width of the interval for allowed bond distances 431 static const double BondThreshold; 385 432 //!> Matrix with bond lenth per two elements 386 433 MatrixContainer *BondLengthMatrix; -
src/Graph/CyclicStructureAnalysis.cpp
r45f835 r9c27b0 28 28 #include "CodePatterns/Log.hpp" 29 29 #include "CodePatterns/Verbose.hpp" 30 #include " element.hpp"30 #include "Element/element.hpp" 31 31 #include "molecule.hpp" 32 32 -
src/Helpers/defs.hpp
r45f835 r9c27b0 5 5 */ 6 6 7 #ifndef DEFS_HPP_8 #define DEFS_HPP_7 #ifndef HELPERS_DEFS_HPP_ 8 #define HELPERS_DEFS_HPP_ 9 9 10 10 // include config.h … … 89 89 const extern unsigned int MAX_FRAGMENTATION_SKIPS; 90 90 91 #endif /* DEFS_HPP_*/91 #endif /* HELPERS_DEFS_HPP_*/ -
src/Helpers/helpers.hpp
r45f835 r9c27b0 4 4 */ 5 5 6 #ifndef HELPERS_H PP_7 #define HELPERS_H PP_6 #ifndef HELPERS_HELPERS_HPP_ 7 #define HELPERS_HELPERS_HPP_ 8 8 9 9 using namespace std; … … 51 51 }; 52 52 53 #endif /* HELPERS_HPP_*/53 #endif /* HELPERS_HELPERS_HPP_*/ -
src/Makefile.am
r45f835 r9c27b0 8 8 9 9 include Actions/Makefile.am 10 include Analysis/Makefile.am 11 include Element/Makefile.am 10 12 include Graph/Makefile.am 13 include Helpers/Makefile.am 14 include Fragmentation/Makefile.am 11 15 include Parser/Makefile.am 12 16 include RandomNumbers/Makefile.am … … 16 20 AM_LDFLAGS = -ldl ${BOOST_LDFLAGS} 17 21 AM_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} 18 19 ANALYSISSOURCE = \20 analysis_bonds.cpp \21 analysis_correlation.cpp22 ANALYSISHEADER = \23 analysis_bonds.hpp \24 analysis_correlation.hpp25 22 26 23 ATOMSOURCE = \ … … 116 113 Dynamics/VerletForceIntegration.hpp 117 114 118 HELPERSSOURCE = \119 Helpers/defs.cpp120 121 HELPERSHEADER = \122 Helpers/defs.hpp \123 Helpers/helpers.hpp124 125 115 THERMOSTATSOURCE = \ 126 116 Thermostats/Berendsen.cpp \ … … 142 132 143 133 TESSELATIONSOURCE = \ 144 BoundaryLineSet.cpp \ 145 BoundaryPointSet.cpp \ 146 BoundaryPolygonSet.cpp \ 147 BoundaryTriangleSet.cpp \ 148 CandidateForTesselation.cpp \ 149 tesselation.cpp \ 150 tesselationhelpers.cpp \ 151 TesselPoint.cpp 134 Tesselation/boundary.cpp \ 135 Tesselation/BoundaryLineSet.cpp \ 136 Tesselation/BoundaryPointSet.cpp \ 137 Tesselation/BoundaryPolygonSet.cpp \ 138 Tesselation/BoundaryTriangleSet.cpp \ 139 Tesselation/CandidateForTesselation.cpp \ 140 Tesselation/ellipsoid.cpp \ 141 Tesselation/tesselation.cpp \ 142 Tesselation/tesselationhelpers.cpp \ 143 Tesselation/TesselPoint.cpp \ 144 Tesselation/triangleintersectionlist.cpp 152 145 153 146 TESSELATIONHEADER = \ 154 BoundaryLineSet.hpp \ 155 BoundaryMaps.hpp \ 156 BoundaryPointSet.hpp \ 157 BoundaryPolygonSet.hpp \ 158 BoundaryTriangleSet.hpp \ 159 CandidateForTesselation.hpp \ 147 Tesselation/boundary.hpp \ 148 Tesselation/BoundaryLineSet.hpp \ 149 Tesselation/BoundaryMaps.hpp \ 150 Tesselation/BoundaryPointSet.hpp \ 151 Tesselation/BoundaryPolygonSet.hpp \ 152 Tesselation/BoundaryTriangleSet.hpp \ 153 Tesselation/CandidateForTesselation.hpp \ 154 Tesselation/ellipsoid.hpp \ 160 155 IPointCloud.hpp \ 161 156 PointCloudAdaptor.hpp \ 162 tesselation.hpp \ 163 tesselationhelpers.hpp \ 164 TesselPoint.hpp 157 Tesselation/tesselation.hpp \ 158 Tesselation/tesselationhelpers.hpp \ 159 Tesselation/TesselPoint.hpp \ 160 Tesselation/triangleintersectionlist.hpp 165 161 166 162 MOLECUILDERSOURCE = \ 167 ${ANALYSISSOURCE} \168 163 ${ATOMSOURCE} \ 169 164 ${BONDSOURCE} \ 170 165 ${DESCRIPTORSOURCE} \ 171 166 ${DYNAMICSSOURCE} \ 172 ${HELPERSSOURCE} \173 167 ${THERMOSTATSOURCE} \ 174 168 ${TESSELATIONSOURCE} \ 175 boundary.cpp \176 169 Box.cpp \ 177 170 config.cpp \ 178 171 ConfigFileBuffer.cpp \ 179 element.cpp \180 elements_db.cpp \181 ellipsoid.cpp \182 172 Formula.cpp \ 183 173 graph.cpp \ … … 188 178 molecule_geometry.cpp \ 189 179 molecule_graph.cpp \ 190 parser.cpp \191 periodentafel.cpp \192 180 ThermoStatContainer.cpp \ 193 triangleintersectionlist.cpp \194 181 UIElements/UIFactory.cpp \ 195 182 version.c \ … … 198 185 199 186 MOLECUILDERHEADER = \ 200 ${ANALYSISHEADER} \201 187 ${ATOMHEADER} \ 202 188 ${BONDHEADER} \ … … 204 190 ${DESCRIPTORIMPLHEADER} \ 205 191 ${DYNAMICSHEADER} \ 206 ${HELPERSHEADER} \207 192 ${THERMOSTATHEADER} \ 208 193 ${TESSELATIONHEADER} \ 209 boundary.hpp \210 194 Box.hpp \ 211 195 config.hpp \ 212 196 ConfigFileBuffer.hpp \ 213 element.hpp \214 elements_db.hpp \215 ellipsoid.hpp \216 197 Formula.hpp \ 217 198 graph.hpp \ 218 199 linkedcell.hpp \ 219 200 molecule.hpp \ 220 parser.hpp \221 periodentafel.hpp \222 201 ThermoStatContainer.hpp \ 223 triangleintersectionlist.hpp \224 202 types.hpp \ 225 203 UIElements/UIFactory.hpp \ … … 281 259 libmenu_a_SOURCES = ${UISOURCE} ${UIHEADER} 282 260 283 molecuilder_DATA = elements.db valence.db orbitals.db Hbonddistance.dbHbondangle.db261 molecuilder_DATA = Element/elements.db Element/valence.db Element/orbitals.db Element/Hbonddistance.db Element/Hbondangle.db 284 262 285 263 molecuilder_CXXFLAGS = $(AM_CPPFLAGS) … … 313 291 $(GUI_LIBS) 314 292 315 joiner_SOURCES = joiner.cpp datacreator.cpp datacreator.hpp periodentafel.hpp293 joiner_SOURCES = Fragmentation/joiner.cpp Fragmentation/datacreator.cpp Fragmentation/datacreator.hpp 316 294 joiner_LDADD = \ 317 libMolecuilder.la \ 318 libMolecuilderParser.la \ 319 libMolecuilderShapes.la \ 320 libMolecuilderRandomNumbers.la \ 295 libMolecuilderFragmentation.la \ 296 libMolecuilderHelpers.la \ 297 libMolecuilderElement.la \ 321 298 $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \ 322 299 ${CodePatterns_LIBS} \ 323 300 $(BOOST_THREAD_LIBS) 324 301 325 analyzer_SOURCES = analyzer.cpp datacreator.cpp periodentafel.hpp datacreator.hpp302 analyzer_SOURCES = Fragmentation/analyzer.cpp Fragmentation/datacreator.cpp Fragmentation/datacreator.hpp 326 303 analyzer_LDADD = \ 327 libMolecuilder.la \ 328 libMolecuilderParser.la \ 329 libMolecuilderShapes.la \ 330 libMolecuilderRandomNumbers.la \ 304 libMolecuilderFragmentation.la \ 305 libMolecuilderHelpers.la \ 306 libMolecuilderElement.la \ 331 307 $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \ 332 308 ${CodePatterns_LIBS} \ -
src/Parser/MpqcParser.cpp
r45f835 r9c27b0 29 29 #include "atom.hpp" 30 30 #include "config.hpp" 31 #include " element.hpp"31 #include "Element/element.hpp" 32 32 #include "molecule.hpp" 33 33 #include "CodePatterns/Log.hpp" … … 35 35 #include "CodePatterns/Verbose.hpp" 36 36 #include "LinearAlgebra/Vector.hpp" 37 #include " periodentafel.hpp"37 #include "Element/periodentafel.hpp" 38 38 #include "World.hpp" 39 39 -
src/Parser/PcpParser.cpp
r45f835 r9c27b0 27 27 #include "config.hpp" 28 28 #include "ConfigFileBuffer.hpp" 29 #include " element.hpp"29 #include "Element/element.hpp" 30 30 #include "CodePatterns/Assert.hpp" 31 31 #include "CodePatterns/Log.hpp" … … 34 34 #include "molecule.hpp" 35 35 #include "PcpParser.hpp" 36 #include " periodentafel.hpp"36 #include "Element/periodentafel.hpp" 37 37 #include "ThermoStatContainer.hpp" 38 38 #include "World.hpp" -
src/Parser/PdbParser.cpp
r45f835 r9c27b0 28 28 #include "atom.hpp" 29 29 #include "Bond/bond.hpp" 30 #include " element.hpp"30 #include "Element/element.hpp" 31 31 #include "molecule.hpp" 32 #include " periodentafel.hpp"32 #include "Element/periodentafel.hpp" 33 33 #include "Descriptors/AtomIdDescriptor.hpp" 34 34 #include "Parser/PdbParser.hpp" -
src/Parser/TremoloParser.cpp
r45f835 r9c27b0 29 29 #include "atom.hpp" 30 30 #include "Bond/bond.hpp" 31 #include " element.hpp"31 #include "Element/element.hpp" 32 32 #include "molecule.hpp" 33 #include " periodentafel.hpp"33 #include "Element/periodentafel.hpp" 34 34 #include "Descriptors/AtomIdDescriptor.hpp" 35 35 #include <map> -
src/Parser/XyzParser.cpp
r45f835 r9c27b0 28 28 #include "atom.hpp" 29 29 #include "molecule.hpp" 30 #include " element.hpp"31 #include " periodentafel.hpp"30 #include "Element/element.hpp" 31 #include "Element/periodentafel.hpp" 32 32 33 33 using namespace std; -
src/Parser/unittests/ParserMpqcUnitTest.cpp
r45f835 r9c27b0 28 28 #include "World.hpp" 29 29 #include "atom.hpp" 30 #include " element.hpp"31 #include " periodentafel.hpp"30 #include "Element/element.hpp" 31 #include "Element/periodentafel.hpp" 32 32 #include "Descriptors/AtomTypeDescriptor.hpp" 33 33 #include "CodePatterns/Assert.hpp" -
src/Parser/unittests/ParserPcpUnitTest.cpp
r45f835 r9c27b0 27 27 #include "World.hpp" 28 28 #include "atom.hpp" 29 #include " element.hpp"30 #include " periodentafel.hpp"29 #include "Element/element.hpp" 30 #include "Element/periodentafel.hpp" 31 31 #include "CodePatterns/Log.hpp" 32 32 #include "Descriptors/AtomTypeDescriptor.hpp" -
src/Parser/unittests/ParserPdbUnitTest.cpp
r45f835 r9c27b0 27 27 #include "World.hpp" 28 28 #include "atom.hpp" 29 #include " element.hpp"30 #include " periodentafel.hpp"29 #include "Element/element.hpp" 30 #include "Element/periodentafel.hpp" 31 31 #include "CodePatterns/Log.hpp" 32 32 #include "Descriptors/AtomTypeDescriptor.hpp" -
src/Parser/unittests/ParserTremoloUnitTest.cpp
r45f835 r9c27b0 26 26 #include "atom.hpp" 27 27 #include "Descriptors/AtomTypeDescriptor.hpp" 28 #include " element.hpp"28 #include "Element/element.hpp" 29 29 #include "Parser/MpqcParser.hpp" 30 30 #include "Parser/PdbParser.hpp" … … 32 32 #include "Parser/TremoloParser.hpp" 33 33 #include "Parser/XyzParser.hpp" 34 #include " periodentafel.hpp"34 #include "Element/periodentafel.hpp" 35 35 #include "World.hpp" 36 36 #include "WorldTime.hpp" -
src/Parser/unittests/ParserXyzUnitTest.cpp
r45f835 r9c27b0 27 27 #include "World.hpp" 28 28 #include "atom.hpp" 29 #include " element.hpp"30 #include " periodentafel.hpp"29 #include "Element/element.hpp" 30 #include "Element/periodentafel.hpp" 31 31 #include "CodePatterns/Log.hpp" 32 32 #include "Descriptors/AtomTypeDescriptor.hpp" -
src/PointCloudAdaptor.hpp
r45f835 r9c27b0 16 16 #include "CodePatterns/Assert.hpp" 17 17 #include "IPointCloud.hpp" 18 #include "Tessel Point.hpp"18 #include "Tesselation/TesselPoint.hpp" 19 19 #include "LinearAlgebra/Vector.hpp" 20 20 -
src/RandomNumbers/unittests/Makefile.am
r45f835 r9c27b0 30 30 31 31 RANDOMNUMBERLIBS = \ 32 ${CodePatterns_LIBS} 33 # $(BOOST_LIB) 32 ../libMolecuilderRandomNumbers.la \ 33 ${CodePatterns_LIBS} \ 34 $(BOOST_LIB) 34 35 35 36 RandomNumberDistributionFactoryUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \ 36 37 ../RandomNumbers/unittests/RandomNumberDistributionFactoryUnitTest.cpp \ 37 38 ../RandomNumbers/unittests/RandomNumberDistributionFactoryUnitTest.hpp 38 RandomNumberDistributionFactoryUnitTest_LDADD = ${RANDOMNUMBERLIBS} \ 39 ../libMolecuilderRandomNumbers.la 39 RandomNumberDistributionFactoryUnitTest_LDADD = ${RANDOMNUMBERLIBS} 40 40 41 41 RandomNumberEngineFactoryUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \ 42 42 ../RandomNumbers/unittests/RandomNumberEngineFactoryUnitTest.cpp \ 43 43 ../RandomNumbers/unittests/RandomNumberEngineFactoryUnitTest.hpp 44 RandomNumberEngineFactoryUnitTest_LDADD = ${RANDOMNUMBERLIBS} \ 45 ../libMolecuilderRandomNumbers.la 44 RandomNumberEngineFactoryUnitTest_LDADD = ${RANDOMNUMBERLIBS} 46 45 47 46 RandomNumberGeneratorFactoryUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \ 48 47 ../RandomNumbers/unittests/RandomNumberGeneratorFactoryUnitTest.cpp \ 49 48 ../RandomNumbers/unittests/RandomNumberGeneratorFactoryUnitTest.hpp 50 RandomNumberGeneratorFactoryUnitTest_LDADD = ${RANDOMNUMBERLIBS} \ 51 ../libMolecuilderRandomNumbers.la 49 RandomNumberGeneratorFactoryUnitTest_LDADD = ${RANDOMNUMBERLIBS} 52 50 53 51 RandomNumberGeneratorUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \ 54 52 ../RandomNumbers/unittests/RandomNumberGeneratorUnitTest.cpp \ 55 53 ../RandomNumbers/unittests/RandomNumberGeneratorUnitTest.hpp 56 RandomNumberGeneratorUnitTest_LDADD = ${RANDOMNUMBERLIBS} \ 57 ../libMolecuilderRandomNumbers.la 54 RandomNumberGeneratorUnitTest_LDADD = ${RANDOMNUMBERLIBS} 58 55 59 56 -
src/Thermostats/Berendsen.cpp
r45f835 r9c27b0 14 14 15 15 #include "Berendsen.hpp" 16 #include " element.hpp"16 #include "Element/element.hpp" 17 17 #include "config.hpp" 18 18 #include "CodePatterns/Verbose.hpp" -
src/Thermostats/GaussianThermostat.cpp
r45f835 r9c27b0 19 19 #include "LinearAlgebra/Vector.hpp" 20 20 #include "AtomSet.hpp" 21 #include " element.hpp"21 #include "Element/element.hpp" 22 22 #include "config.hpp" 23 23 #include "World.hpp" -
src/Thermostats/Langevin.cpp
r45f835 r9c27b0 14 14 15 15 #include "Langevin.hpp" 16 #include " element.hpp"16 #include "Element/element.hpp" 17 17 #include "config.hpp" 18 18 #include "CodePatterns/Verbose.hpp" -
src/Thermostats/NoseHoover.cpp
r45f835 r9c27b0 15 15 #include "NoseHoover.hpp" 16 16 17 #include " element.hpp"17 #include "Element/element.hpp" 18 18 #include "config.hpp" 19 19 #include "CodePatterns/Verbose.hpp" -
src/Thermostats/Woodcock.cpp
r45f835 r9c27b0 15 15 #include "Woodcock.hpp" 16 16 17 #include " element.hpp"17 #include "Element/element.hpp" 18 18 #include "config.hpp" 19 19 #include "CodePatterns/Verbose.hpp" -
src/UIElements/CommandLineUI/Query/ElementCommandLineQuery.cpp
r45f835 r9c27b0 24 24 #include "CodePatterns/Log.hpp" 25 25 #include "CodePatterns/Verbose.hpp" 26 #include " element.hpp"27 #include " periodentafel.hpp"26 #include "Element/element.hpp" 27 #include "Element/periodentafel.hpp" 28 28 #include "World.hpp" 29 29 -
src/UIElements/CommandLineUI/Query/ElementsCommandLineQuery.cpp
r45f835 r9c27b0 24 24 #include "CodePatterns/Log.hpp" 25 25 #include "CodePatterns/Verbose.hpp" 26 #include " element.hpp"27 #include " periodentafel.hpp"26 #include "Element/element.hpp" 27 #include "Element/periodentafel.hpp" 28 28 #include "World.hpp" 29 29 -
src/UIElements/CommandLineUI/TypeEnumContainer.cpp
r45f835 r9c27b0 34 34 #include "LinearAlgebra/BoxVector.hpp" 35 35 #include "LinearAlgebra/Vector.hpp" 36 #include " element.hpp"36 #include "Element/element.hpp" 37 37 #include "molecule.hpp" 38 38 #include "RandomNumbers/RandomNumberDistribution_Parameters.hpp" -
src/UIElements/Makefile.am
r45f835 r9c27b0 264 264 libMolecuilderActionPrototypes.la \ 265 265 libMolecuilderActions.la \ 266 libMolecuilderAnalysis.la \ 266 267 libMolecuilderGraph.la \ 267 268 libMolecuilder.la \ 269 libMolecuilderFragmentation.la \ 268 270 libMolecuilderParser.la \ 269 271 libMolecuilderShapes.la \ 272 libMolecuilderHelpers.la \ 273 libMolecuilderElement.la \ 270 274 $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \ 271 275 libMolecuilderRandomNumbers.la \ -
src/UIElements/Qt4/Pipe/ElementQtQueryPipe.cpp
r45f835 r9c27b0 24 24 25 25 #include "CodePatterns/MemDebug.hpp" 26 #include " element.hpp"27 #include " periodentafel.hpp"26 #include "Element/element.hpp" 27 #include "Element/periodentafel.hpp" 28 28 #include "World.hpp" 29 29 -
src/UIElements/Qt4/Pipe/ElementsQtQueryPipe.cpp
r45f835 r9c27b0 26 26 27 27 #include "CodePatterns/MemDebug.hpp" 28 #include " element.hpp"29 #include " periodentafel.hpp"28 #include "Element/element.hpp" 29 #include "Element/periodentafel.hpp" 30 30 #include "World.hpp" 31 31 -
src/UIElements/Qt4/Query/ElementQtQuery.cpp
r45f835 r9c27b0 27 27 #include "UIElements/Qt4/Pipe/ElementQtQueryPipe.hpp" 28 28 29 #include " element.hpp"30 #include " periodentafel.hpp"29 #include "Element/element.hpp" 30 #include "Element/periodentafel.hpp" 31 31 #include "World.hpp" 32 32 -
src/UIElements/Qt4/Query/ElementsQtQuery.cpp
r45f835 r9c27b0 27 27 #include "UIElements/Qt4/Pipe/ElementsQtQueryPipe.hpp" 28 28 29 #include " element.hpp"30 #include " periodentafel.hpp"29 #include "Element/element.hpp" 30 #include "Element/periodentafel.hpp" 31 31 #include "World.hpp" 32 32 -
src/UIElements/TextUI/Query/ElementTextQuery.cpp
r45f835 r9c27b0 26 26 #include "CodePatterns/Log.hpp" 27 27 #include "CodePatterns/Verbose.hpp" 28 #include " element.hpp"29 #include " periodentafel.hpp"28 #include "Element/element.hpp" 29 #include "Element/periodentafel.hpp" 30 30 #include "World.hpp" 31 31 -
src/UIElements/TextUI/Query/ElementsTextQuery.cpp
r45f835 r9c27b0 27 27 #include "CodePatterns/Log.hpp" 28 28 #include "CodePatterns/Verbose.hpp" 29 #include " element.hpp"30 #include " periodentafel.hpp"29 #include "Element/element.hpp" 30 #include "Element/periodentafel.hpp" 31 31 #include "World.hpp" 32 32 -
src/UIElements/TextUI/TextWindow.cpp
r45f835 r9c27b0 45 45 // all needed due to config::SaveAll() 46 46 #include "config.hpp" 47 #include " periodentafel.hpp"47 #include "Element/periodentafel.hpp" 48 48 49 49 // config::SaveAll() and enumerate() -
src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject.cpp
r45f835 r9c27b0 33 33 34 34 #include "Helpers/defs.hpp" 35 #include " element.hpp"36 #include " periodentafel.hpp"35 #include "Element/element.hpp" 36 #include "Element/periodentafel.hpp" 37 37 #include "World.hpp" 38 38 -
src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_atom.cpp
r45f835 r9c27b0 30 30 31 31 #include "Descriptors/AtomIdDescriptor.hpp" 32 #include " element.hpp"32 #include "Element/element.hpp" 33 33 #include "LinearAlgebra/Vector.hpp" 34 34 #include "World.hpp" -
src/UIElements/Views/Qt4/Qt3D/GLMoleculeObject_bond.cpp
r45f835 r9c27b0 32 32 #include "atom.hpp" 33 33 #include "Bond/bond.hpp" 34 #include " element.hpp"34 #include "Element/element.hpp" 35 35 #include "Helpers/defs.hpp" 36 36 #include "LinearAlgebra/Line.hpp" -
src/UIElements/Views/Qt4/Qt3D/GLWorldView.cpp
r45f835 r9c27b0 145 145 //#include "atom.hpp" 146 146 //#include "Bond/bond.hpp" 147 //#include " element.hpp"147 //#include "Element/element.hpp" 148 148 //#include "molecule.hpp" 149 //#include " periodentafel.hpp"149 //#include "Element/periodentafel.hpp" 150 150 //#include "World.hpp" 151 151 // -
src/World.cpp
r45f835 r9c27b0 40 40 #include "LinearAlgebra/RealSpaceMatrix.hpp" 41 41 #include "molecule.hpp" 42 #include " periodentafel.hpp"42 #include "Element/periodentafel.hpp" 43 43 #include "ThermoStatContainer.hpp" 44 44 #include "WorldTime.hpp" … … 802 802 Observable("World"), 803 803 BG(new BondGraph(true)), // assume Angstroem for the moment 804 periode(new periodentafel ),804 periode(new periodentafel(true)), 805 805 configuration(new config), 806 806 Thermostats(new ThermoStatContainer), -
src/atom.cpp
r45f835 r9c27b0 23 23 #include "CodePatterns/Log.hpp" 24 24 #include "config.hpp" 25 #include "element.hpp" 26 #include "parser.hpp" 25 #include "Element/element.hpp" 27 26 #include "LinearAlgebra/Vector.hpp" 28 27 #include "World.hpp" -
src/atom.hpp
r45f835 r9c27b0 26 26 #include "atom_graphnode.hpp" 27 27 #include "atom_particleinfo.hpp" 28 #include "Tessel Point.hpp"28 #include "Tesselation/TesselPoint.hpp" 29 29 #include "types.hpp" 30 30 -
src/atom_atominfo.cpp
r45f835 r9c27b0 23 23 #include "CodePatterns/Verbose.hpp" 24 24 #include "config.hpp" 25 #include " element.hpp"26 #include " parser.hpp"27 #include " periodentafel.hpp"25 #include "Element/element.hpp" 26 #include "Element/periodentafel.hpp" 27 #include "Fragmentation/ForceMatrix.hpp" 28 28 #include "World.hpp" 29 29 #include "WorldTime.hpp" -
src/atom_bondedparticle.cpp
r45f835 r9c27b0 26 26 #include "CodePatterns/Log.hpp" 27 27 #include "CodePatterns/Verbose.hpp" 28 #include " element.hpp"28 #include "Element/element.hpp" 29 29 #include "WorldTime.hpp" 30 30 -
src/builder_init.cpp
r45f835 r9c27b0 26 26 #include "CodePatterns/Log.hpp" 27 27 #include "molecule.hpp" 28 #include " periodentafel.hpp"29 #include " tesselationhelpers.hpp"28 #include "Element/periodentafel.hpp" 29 #include "Tesselation/tesselationhelpers.hpp" 30 30 #include "UIElements/UIFactory.hpp" 31 31 #include "UIElements/Menu/MenuDescription.hpp" -
src/config.cpp
r45f835 r9c27b0 34 34 #include "config.hpp" 35 35 #include "ConfigFileBuffer.hpp" 36 #include " element.hpp"36 #include "Element/element.hpp" 37 37 #include "Graph/BondGraph.hpp" 38 38 #include "Helpers/helpers.hpp" … … 40 40 #include "molecule.hpp" 41 41 #include "molecule.hpp" 42 #include " periodentafel.hpp"42 #include "Element/periodentafel.hpp" 43 43 #include "ThermoStatContainer.hpp" 44 44 #include "World.hpp" -
src/linkedcell.cpp
r45f835 r9c27b0 26 26 #include "molecule.hpp" 27 27 #include "IPointCloud.hpp" 28 #include " tesselation.hpp"28 #include "Tesselation/tesselation.hpp" 29 29 #include "LinearAlgebra/Vector.hpp" 30 30 -
src/molecule.cpp
r45f835 r9c27b0 32 32 #include "CodePatterns/Log.hpp" 33 33 #include "config.hpp" 34 #include " element.hpp"34 #include "Element/element.hpp" 35 35 #include "graph.hpp" 36 36 #include "Graph/BondGraph.hpp" … … 42 42 #include "linkedcell.hpp" 43 43 #include "molecule.hpp" 44 #include " periodentafel.hpp"45 #include " tesselation.hpp"44 #include "Element/periodentafel.hpp" 45 #include "Tesselation/tesselation.hpp" 46 46 #include "World.hpp" 47 47 #include "WorldTime.hpp" -
src/molecule_fragmentation.cpp
r45f835 r9c27b0 28 28 #include "CodePatterns/Log.hpp" 29 29 #include "config.hpp" 30 #include " element.hpp"30 #include "Element/element.hpp" 31 31 #include "Graph/BondGraph.hpp" 32 32 #include "Graph/CheckAgainstAdjacencyFile.hpp" … … 36 36 #include "LinearAlgebra/RealSpaceMatrix.hpp" 37 37 #include "molecule.hpp" 38 #include " periodentafel.hpp"38 #include "Element/periodentafel.hpp" 39 39 #include "World.hpp" 40 40 -
src/molecule_geometry.cpp
r45f835 r9c27b0 26 26 #include "CodePatterns/Verbose.hpp" 27 27 #include "config.hpp" 28 #include " element.hpp"28 #include "Element/element.hpp" 29 29 #include "Graph/BondGraph.hpp" 30 30 #include "LinearAlgebra/leastsquaremin.hpp" -
src/molecule_graph.cpp
r45f835 r9c27b0 31 31 #include "config.hpp" 32 32 #include "Graph/DepthFirstSearchAnalysis.hpp" 33 #include " element.hpp"33 #include "Element/element.hpp" 34 34 #include "Graph/BondGraph.hpp" 35 35 #include "Helpers/defs.hpp" -
src/moleculelist.cpp
r45f835 r9c27b0 26 26 #include "atom.hpp" 27 27 #include "Bond/bond.hpp" 28 #include " boundary.hpp"28 #include "Tesselation/boundary.hpp" 29 29 #include "Box.hpp" 30 30 #include "CodePatterns/Assert.hpp" … … 32 32 #include "CodePatterns/Verbose.hpp" 33 33 #include "config.hpp" 34 #include " element.hpp"34 #include "Element/element.hpp" 35 35 #include "Graph/BondGraph.hpp" 36 36 #include "Helpers/helpers.hpp" … … 40 40 #include "Parser/MpqcParser.hpp" 41 41 #include "Parser/FormatParserStorage.hpp" 42 #include " periodentafel.hpp"43 #include " tesselation.hpp"42 #include "Element/periodentafel.hpp" 43 #include "Tesselation/tesselation.hpp" 44 44 #include "World.hpp" 45 45 #include "WorldTime.hpp" -
src/unittests/LinkedCellUnitTest.cpp
r45f835 r9c27b0 30 30 #include "atom.hpp" 31 31 #include "Descriptors/MoleculeDescriptor.hpp" 32 #include " element.hpp"32 #include "Element/element.hpp" 33 33 #include "linkedcell.hpp" 34 34 #include "molecule.hpp" 35 #include " periodentafel.hpp"35 #include "Element/periodentafel.hpp" 36 36 #include "PointCloudAdaptor.hpp" 37 37 #include "World.hpp" -
src/unittests/ListOfBondsUnitTest.cpp
r45f835 r9c27b0 30 30 #include "atom.hpp" 31 31 #include "Bond/bond.hpp" 32 #include " element.hpp"32 #include "Element/element.hpp" 33 33 #include "molecule.hpp" 34 #include " periodentafel.hpp"34 #include "Element/periodentafel.hpp" 35 35 #include "World.hpp" 36 36 #include "WorldTime.hpp" -
src/unittests/Makefile.am
r45f835 r9c27b0 7 7 8 8 include ../../src/Actions/unittests/Makefile.am 9 include ../../src/Analysis/unittests/Makefile.am 9 10 include ../../src/Descriptors/unittests/Makefile.am 11 include ../../src/Element/unittests/Makefile.am 12 include ../../src/Fragmentation/unittests/Makefile.am 13 include ../../src/Graph/unittests/Makefile.am 10 14 include ../../src/Parser/unittests/Makefile.am 11 15 include ../../src/RandomNumbers/unittests/Makefile.am 12 16 include ../../src/Shapes/unittests/Makefile.am 17 include ../../src/Tesselation/unittests/Makefile.am 13 18 include ../../src/UIElements/CommandLineUI/unittests/Makefile.am 14 19 include ../../src/UIElements/Menu/unittests/Makefile.am … … 20 25 21 26 GENERALTESTS = \ 22 AnalysisBondsUnitTest \23 AnalysisCorrelationToPointUnitTest \24 AnalysisCorrelationToSurfaceUnitTest \25 AnalysisPairCorrelationUnitTest \26 BondGraphUnitTest \27 27 BoxUnitTest \ 28 CountBondsUnitTest \29 ElementUnitTest \30 28 FormulaUnittest \ 31 29 LinkedCellUnitTest \ 32 30 ListOfBondsUnitTest \ 33 PeriodentafelUnitTest \34 TesselationUnitTest \35 Tesselation_BoundaryTriangleUnitTest \36 Tesselation_InOutsideUnitTest \37 31 WorldTimeUnitTest 38 32 … … 49 43 $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) 50 44 45 GENERALLIBS = \ 46 ../libMolecuilder.la \ 47 ../libMolecuilderHelpers.la \ 48 $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \ 49 ${CodePatterns_LIBS} \ 50 $(BOOST_LIB) 51 51 52 ALLLIBS = \ 52 53 ../libMolecuilderUI.la \ … … 58 59 TESTSOURCES = \ 59 60 ${ACTIONTESTSSOURCES} \ 61 ${ANALYSISTESTSSOURCES} \ 60 62 ${DESCRIPTORTESTSSOURCES} \ 63 ${ELEMENTTESTSSOURCES} \ 64 ${FRAGMENTATIONTESTSSOURCES} \ 65 ${GRAPHTESTSSOURCES} \ 61 66 ${LINEARALGEBRATESTSSOURCES} \ 62 67 ${PARSERTESTSSOURCES} \ 63 68 ${RANDOMNUMBERTESTSSOURCES} \ 64 69 ${SHAPETESTSSOURCES} \ 70 ${TESSELATIONTESTSSOURCES} \ 65 71 $(UIELEMENTSCOMMANDLINEPARSERTESTSSOURCES) \ 66 72 ${UIELEMENTSMENUTESTSSOURCES} \ 67 AnalysisBondsUnitTest.cpp \68 AnalysisCorrelationToPointUnitTest.cpp \69 AnalysisCorrelationToSurfaceUnitTest.cpp \70 AnalysisPairCorrelationUnitTest.cpp \71 BondGraphUnitTest.cpp \72 73 BoxUnitTest.cpp \ 73 CountBondsUnitTest.cpp \74 ElementUnitTest.cpp \75 74 FormulaUnitTest.cpp \ 76 75 LinkedCellUnitTest.cpp \ 77 76 ListOfBondsUnitTest.cpp \ 78 PeriodentafelUnitTest.cpp \79 TesselationUnitTest.cpp \80 Tesselation_BoundaryTriangleUnitTest.cpp \81 Tesselation_InsideOutsideUnitTest.cpp \82 77 WorldTimeUnitTest.cpp 83 78 84 79 TESTHEADERS = \ 85 80 ${ACTIONTESTSHEADERS} \ 81 ${ANALYSISTESTSHEADERS} \ 86 82 ${DESCRIPTORTESTSHEADERS} \ 83 ${ELEMENTTESTSHEADERS} \ 84 ${FRAGMENTATIONTESTSHEADERS} \ 85 ${GRAPHTESTSHEADERS} \ 87 86 ${LINEARALGEBRATESTSHEADERS} \ 88 87 ${PARSERTESTSHEADERS} \ 89 88 ${RANDOMNUMBERTESTSHEADERS} \ 90 89 ${SHAPETESTSHEADERS} \ 90 ${TESSELATIONTESTSHEADERS} \ 91 91 $(UIELEMENTSCOMMANDLINEPARSERTESTSHEADERS) \ 92 92 ${UIELEMENTSMENUTESTSHEADERS} \ 93 AnalysisBondsUnitTest.hpp \94 AnalysisCorrelationToPointUnitTest.hpp \95 AnalysisCorrelationToSurfaceUnitTest.hpp \96 AnalysisPairCorrelationUnitTest.hpp \97 BondGraphUnitTest.hpp \98 93 BoxUnitTest.hpp \ 99 CountBondsUnitTest.hpp \100 ElementUnitTest.hpp \101 94 FormulaUnitTest.hpp \ 102 95 LinkedCellUnitTest.hpp \ 103 96 ListOfBondsUnitTest.hpp \ 104 PeriodentafelUnitTest.hpp \105 TesselationUnitTest.hpp \106 Tesselation_BoundaryTriangleUnitTest.hpp \107 Tesselation_InsideOutsideUnitTest.hpp \108 97 WorldTimeUnitTest.hpp 109 98 110 111 AnalysisBondsUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \112 AnalysisBondsUnitTest.cpp \113 AnalysisBondsUnitTest.hpp114 AnalysisBondsUnitTest_LDADD = ${ALLLIBS}115 116 AnalysisCorrelationToPointUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \117 AnalysisCorrelationToPointUnitTest.cpp \118 AnalysisCorrelationToPointUnitTest.hpp119 AnalysisCorrelationToPointUnitTest_LDADD = ${ALLLIBS}120 121 AnalysisCorrelationToSurfaceUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \122 AnalysisCorrelationToSurfaceUnitTest.cpp \123 AnalysisCorrelationToSurfaceUnitTest.hpp124 AnalysisCorrelationToSurfaceUnitTest_LDADD = ${ALLLIBS}125 126 AnalysisPairCorrelationUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \127 AnalysisPairCorrelationUnitTest.cpp \128 AnalysisPairCorrelationUnitTest.hpp129 AnalysisPairCorrelationUnitTest_LDADD = ${ALLLIBS}130 131 BondGraphUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \132 BondGraphUnitTest.cpp \133 BondGraphUnitTest.hpp134 BondGraphUnitTest_LDADD = ${ALLLIBS}135 99 136 100 BoxUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \ 137 101 BoxUnitTest.cpp \ 138 102 BoxUnitTest.hpp 139 BoxUnitTest_LDADD = ${ALLLIBS} 140 141 CountBondsUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \ 142 CountBondsUnitTest.cpp \ 143 CountBondsUnitTest.hpp 144 CountBondsUnitTest_LDADD = ${ALLLIBS} 145 146 ElementUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \ 147 ElementUnitTest.cpp \ 148 ../element.cpp \ 149 ElementUnitTest.hpp \ 150 ../element.hpp 151 ElementUnitTest_LDADD = \ 152 $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) 103 BoxUnitTest_LDADD = \ 104 ../libMolecuilder.la \ 105 ../libMolecuilderShapes.la \ 106 ../libMolecuilderHelpers.la \ 107 $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la 153 108 154 109 FormulaUnittest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \ 155 110 FormulaUnitTest.cpp \ 156 111 FormulaUnitTest.hpp 157 FormulaUnittest_LDADD = $ {ALLLIBS}112 FormulaUnittest_LDADD = $(ALLLIBS) 158 113 159 114 LinkedCellUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \ 160 115 LinkedCellUnitTest.cpp \ 161 116 LinkedCellUnitTest.hpp 162 LinkedCellUnitTest_LDADD = $ {ALLLIBS}117 LinkedCellUnitTest_LDADD = $(ALLLIBS) 163 118 164 119 ListOfBondsUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \ 165 120 ListOfBondsUnitTest.cpp \ 166 121 ListOfBondsUnitTest.hpp 167 ListOfBondsUnitTest_LDADD = ${ALLLIBS} 168 169 PeriodentafelUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \ 170 PeriodentafelUnitTest.cpp \ 171 PeriodentafelUnitTest.hpp 172 PeriodentafelUnitTest_LDADD = ${ALLLIBS} 173 174 TesselationUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \ 175 TesselationUnitTest.cpp \ 176 TesselationUnitTest.hpp 177 TesselationUnitTest_LDADD = ${ALLLIBS} 178 179 Tesselation_BoundaryTriangleUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \ 180 Tesselation_BoundaryTriangleUnitTest.cpp \ 181 Tesselation_BoundaryTriangleUnitTest.hpp 182 Tesselation_BoundaryTriangleUnitTest_LDADD = ${ALLLIBS} 183 184 Tesselation_InOutsideUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \ 185 Tesselation_InsideOutsideUnitTest.cpp \ 186 Tesselation_InsideOutsideUnitTest.hpp 187 Tesselation_InOutsideUnitTest_LDADD = ${ALLLIBS} 122 ListOfBondsUnitTest_LDADD = $(ALLLIBS) 188 123 189 124 WorldTimeUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \ -
tests/Fragmentations/Makefile.am
r45f835 r9c27b0 4 4 testsuite.at \ 5 5 $(TESTSUITE) \ 6 analyzer.in \ 6 7 atlocal.in \ 8 joiner.in \ 7 9 molecuilder.in \ 8 10 $(srcdir)/package.m4 \ 9 $(srcdir)/1_2-dimethoxyethane \ 10 $(srcdir)/1_2-dimethylbenzene \ 11 $(srcdir)/2-methylcyclohexanone \ 12 $(srcdir)/benzene \ 13 $(srcdir)/cholesterol \ 14 $(srcdir)/cycloheptane \ 15 $(srcdir)/dimethyl_bromomalonate \ 16 $(srcdir)/glucose \ 17 $(srcdir)/heptan \ 18 $(srcdir)/isoleucine \ 19 $(srcdir)/neohexane \ 20 $(srcdir)/N_N-dimethylacetamide \ 21 $(srcdir)/proline \ 22 $(srcdir)/putrescine \ 23 $(srcdir)/tartaric_acid 11 $(srcdir)/Analyzing/heptan \ 12 $(srcdir)/Fragmenting/1_2-dimethoxyethane \ 13 $(srcdir)/Fragmenting/1_2-dimethylbenzene \ 14 $(srcdir)/Fragmenting/2-methylcyclohexanone \ 15 $(srcdir)/Fragmenting/benzene \ 16 $(srcdir)/Fragmenting/cholesterol \ 17 $(srcdir)/Fragmenting/cycloheptane \ 18 $(srcdir)/Fragmenting/dimethyl_bromomalonate \ 19 $(srcdir)/Fragmenting/glucose \ 20 $(srcdir)/Fragmenting/heptan \ 21 $(srcdir)/Fragmenting/isoleucine \ 22 $(srcdir)/Fragmenting/neohexane \ 23 $(srcdir)/Fragmenting/N_N-dimethylacetamide \ 24 $(srcdir)/Fragmenting/proline \ 25 $(srcdir)/Fragmenting/putrescine \ 26 $(srcdir)/Fragmenting/tartaric_acid \ 27 $(srcdir)/Joining/heptan 24 28 25 29 TESTSUITE = $(srcdir)/testsuite … … 28 32 29 33 TESTSCRIPTS = \ 30 1_2-dimethoxyethane/testsuite-1_2-dimethoxyethane-order1.at \ 31 1_2-dimethoxyethane/testsuite-1_2-dimethoxyethane-order2.at \ 32 1_2-dimethoxyethane/testsuite-1_2-dimethoxyethane-order3.at \ 33 1_2-dimethoxyethane/testsuite-1_2-dimethoxyethane-order4.at \ 34 1_2-dimethylbenzene/testsuite-1_2-dimethylbenzene-order1.at \ 35 1_2-dimethylbenzene/testsuite-1_2-dimethylbenzene-order2.at \ 36 1_2-dimethylbenzene/testsuite-1_2-dimethylbenzene-order3.at \ 37 1_2-dimethylbenzene/testsuite-1_2-dimethylbenzene-order4.at \ 38 2-methylcyclohexanone/testsuite-2-methylcyclohexanone-order1.at \ 39 2-methylcyclohexanone/testsuite-2-methylcyclohexanone-order2.at \ 40 2-methylcyclohexanone/testsuite-2-methylcyclohexanone-order3.at \ 41 2-methylcyclohexanone/testsuite-2-methylcyclohexanone-order4.at \ 42 benzene/testsuite-benzene-order1.at \ 43 benzene/testsuite-benzene-order2.at \ 44 benzene/testsuite-benzene-order3.at \ 45 benzene/testsuite-benzene-order4.at \ 46 benzene/testsuite-benzene-order5.at \ 47 benzene/testsuite-benzene-order6.at \ 48 cholesterol/testsuite-cholesterol-order1.at \ 49 cholesterol/testsuite-cholesterol-order2.at \ 50 cholesterol/testsuite-cholesterol-order3.at \ 51 cholesterol/testsuite-cholesterol-order4.at \ 52 cycloheptane/testsuite-cycloheptane-order1.at \ 53 cycloheptane/testsuite-cycloheptane-order2.at \ 54 cycloheptane/testsuite-cycloheptane-order3.at \ 55 cycloheptane/testsuite-cycloheptane-order4.at \ 56 cycloheptane/testsuite-cycloheptane-order5.at \ 57 cycloheptane/testsuite-cycloheptane-order6.at \ 58 dimethyl_bromomalonate/testsuite-dimethyl_bromomalonate-order1.at \ 59 dimethyl_bromomalonate/testsuite-dimethyl_bromomalonate-order2.at \ 60 dimethyl_bromomalonate/testsuite-dimethyl_bromomalonate-order3.at \ 61 dimethyl_bromomalonate/testsuite-dimethyl_bromomalonate-order4.at \ 62 dimethyl_bromomalonate/testsuite-dimethyl_bromomalonate-order5.at \ 63 dimethyl_bromomalonate/testsuite-dimethyl_bromomalonate-order6.at \ 64 glucose/testsuite-glucose-order1.at \ 65 glucose/testsuite-glucose-order2.at \ 66 glucose/testsuite-glucose-order3.at \ 67 glucose/testsuite-glucose-order4.at \ 68 glucose/testsuite-glucose-order5.at \ 69 glucose/testsuite-glucose-order6.at \ 70 heptan/testsuite-heptan-order1.at \ 71 heptan/testsuite-heptan-order2.at \ 72 heptan/testsuite-heptan-order3.at \ 73 heptan/testsuite-heptan-order4.at \ 74 isoleucine/testsuite-isoleucine-order1.at \ 75 isoleucine/testsuite-isoleucine-order2.at \ 76 isoleucine/testsuite-isoleucine-order3.at \ 77 isoleucine/testsuite-isoleucine-order4.at \ 78 isoleucine/testsuite-isoleucine-order5.at \ 79 isoleucine/testsuite-isoleucine-order6.at \ 80 neohexane/testsuite-neohexane-order1.at \ 81 neohexane/testsuite-neohexane-order2.at \ 82 neohexane/testsuite-neohexane-order3.at \ 83 neohexane/testsuite-neohexane-order4.at \ 84 neohexane/testsuite-neohexane-order5.at \ 85 neohexane/testsuite-neohexane-order6.at \ 86 N_N-dimethylacetamide/testsuite-N_N-dimethylacetamide-order1.at \ 87 N_N-dimethylacetamide/testsuite-N_N-dimethylacetamide-order2.at \ 88 N_N-dimethylacetamide/testsuite-N_N-dimethylacetamide-order3.at \ 89 N_N-dimethylacetamide/testsuite-N_N-dimethylacetamide-order4.at \ 90 N_N-dimethylacetamide/testsuite-N_N-dimethylacetamide-order5.at \ 91 N_N-dimethylacetamide/testsuite-N_N-dimethylacetamide-order6.at \ 92 proline/testsuite-proline-order1.at \ 93 proline/testsuite-proline-order2.at \ 94 proline/testsuite-proline-order3.at \ 95 proline/testsuite-proline-order4.at \ 96 proline/testsuite-proline-order5.at \ 97 proline/testsuite-proline-order6.at \ 98 putrescine/testsuite-putrescine-order1.at \ 99 putrescine/testsuite-putrescine-order2.at \ 100 putrescine/testsuite-putrescine-order3.at \ 101 putrescine/testsuite-putrescine-order4.at \ 102 putrescine/testsuite-putrescine-order5.at \ 103 putrescine/testsuite-putrescine-order6.at \ 104 tartaric_acid/testsuite-tartaric_acid-order1.at \ 105 tartaric_acid/testsuite-tartaric_acid-order2.at \ 106 tartaric_acid/testsuite-tartaric_acid-order3.at \ 107 tartaric_acid/testsuite-tartaric_acid-order4.at \ 108 tartaric_acid/testsuite-tartaric_acid-order5.at \ 109 tartaric_acid/testsuite-tartaric_acid-order6.at 34 Fragmenting/1_2-dimethoxyethane/testsuite-fragmenting-1_2-dimethoxyethane-order1.at \ 35 Fragmenting/1_2-dimethoxyethane/testsuite-fragmenting-1_2-dimethoxyethane-order2.at \ 36 Fragmenting/1_2-dimethoxyethane/testsuite-fragmenting-1_2-dimethoxyethane-order3.at \ 37 Fragmenting/1_2-dimethoxyethane/testsuite-fragmenting-1_2-dimethoxyethane-order4.at \ 38 Fragmenting/1_2-dimethylbenzene/testsuite-fragmenting-1_2-dimethylbenzene-order1.at \ 39 Fragmenting/1_2-dimethylbenzene/testsuite-fragmenting-1_2-dimethylbenzene-order2.at \ 40 Fragmenting/1_2-dimethylbenzene/testsuite-fragmenting-1_2-dimethylbenzene-order3.at \ 41 Fragmenting/1_2-dimethylbenzene/testsuite-fragmenting-1_2-dimethylbenzene-order4.at \ 42 Fragmenting/2-methylcyclohexanone/testsuite-fragmenting-2-methylcyclohexanone-order1.at \ 43 Fragmenting/2-methylcyclohexanone/testsuite-fragmenting-2-methylcyclohexanone-order2.at \ 44 Fragmenting/2-methylcyclohexanone/testsuite-fragmenting-2-methylcyclohexanone-order3.at \ 45 Fragmenting/2-methylcyclohexanone/testsuite-fragmenting-2-methylcyclohexanone-order4.at \ 46 Fragmenting/benzene/testsuite-fragmenting-benzene-order1.at \ 47 Fragmenting/benzene/testsuite-fragmenting-benzene-order2.at \ 48 Fragmenting/benzene/testsuite-fragmenting-benzene-order3.at \ 49 Fragmenting/benzene/testsuite-fragmenting-benzene-order4.at \ 50 Fragmenting/benzene/testsuite-fragmenting-benzene-order5.at \ 51 Fragmenting/benzene/testsuite-fragmenting-benzene-order6.at \ 52 Fragmenting/cholesterol/testsuite-fragmenting-cholesterol-order1.at \ 53 Fragmenting/cholesterol/testsuite-fragmenting-cholesterol-order2.at \ 54 Fragmenting/cholesterol/testsuite-fragmenting-cholesterol-order3.at \ 55 Fragmenting/cholesterol/testsuite-fragmenting-cholesterol-order4.at \ 56 Fragmenting/cycloheptane/testsuite-fragmenting-cycloheptane-order1.at \ 57 Fragmenting/cycloheptane/testsuite-fragmenting-cycloheptane-order2.at \ 58 Fragmenting/cycloheptane/testsuite-fragmenting-cycloheptane-order3.at \ 59 Fragmenting/cycloheptane/testsuite-fragmenting-cycloheptane-order4.at \ 60 Fragmenting/cycloheptane/testsuite-fragmenting-cycloheptane-order5.at \ 61 Fragmenting/cycloheptane/testsuite-fragmenting-cycloheptane-order6.at \ 62 Fragmenting/dimethyl_bromomalonate/testsuite-fragmenting-dimethyl_bromomalonate-order1.at \ 63 Fragmenting/dimethyl_bromomalonate/testsuite-fragmenting-dimethyl_bromomalonate-order2.at \ 64 Fragmenting/dimethyl_bromomalonate/testsuite-fragmenting-dimethyl_bromomalonate-order3.at \ 65 Fragmenting/dimethyl_bromomalonate/testsuite-fragmenting-dimethyl_bromomalonate-order4.at \ 66 Fragmenting/dimethyl_bromomalonate/testsuite-fragmenting-dimethyl_bromomalonate-order5.at \ 67 Fragmenting/dimethyl_bromomalonate/testsuite-fragmenting-dimethyl_bromomalonate-order6.at \ 68 Fragmenting/glucose/testsuite-fragmenting-glucose-order1.at \ 69 Fragmenting/glucose/testsuite-fragmenting-glucose-order2.at \ 70 Fragmenting/glucose/testsuite-fragmenting-glucose-order3.at \ 71 Fragmenting/glucose/testsuite-fragmenting-glucose-order4.at \ 72 Fragmenting/glucose/testsuite-fragmenting-glucose-order5.at \ 73 Fragmenting/glucose/testsuite-fragmenting-glucose-order6.at \ 74 Fragmenting/heptan/testsuite-fragmenting-heptan-order1.at \ 75 Fragmenting/heptan/testsuite-fragmenting-heptan-order2.at \ 76 Fragmenting/heptan/testsuite-fragmenting-heptan-order3.at \ 77 Fragmenting/heptan/testsuite-fragmenting-heptan-order4.at \ 78 Fragmenting/isoleucine/testsuite-fragmenting-isoleucine-order1.at \ 79 Fragmenting/isoleucine/testsuite-fragmenting-isoleucine-order2.at \ 80 Fragmenting/isoleucine/testsuite-fragmenting-isoleucine-order3.at \ 81 Fragmenting/isoleucine/testsuite-fragmenting-isoleucine-order4.at \ 82 Fragmenting/isoleucine/testsuite-fragmenting-isoleucine-order5.at \ 83 Fragmenting/isoleucine/testsuite-fragmenting-isoleucine-order6.at \ 84 Fragmenting/neohexane/testsuite-fragmenting-neohexane-order1.at \ 85 Fragmenting/neohexane/testsuite-fragmenting-neohexane-order2.at \ 86 Fragmenting/neohexane/testsuite-fragmenting-neohexane-order3.at \ 87 Fragmenting/neohexane/testsuite-fragmenting-neohexane-order4.at \ 88 Fragmenting/neohexane/testsuite-fragmenting-neohexane-order5.at \ 89 Fragmenting/neohexane/testsuite-fragmenting-neohexane-order6.at \ 90 Fragmenting/N_N-dimethylacetamide/testsuite-fragmenting-N_N-dimethylacetamide-order1.at \ 91 Fragmenting/N_N-dimethylacetamide/testsuite-fragmenting-N_N-dimethylacetamide-order2.at \ 92 Fragmenting/N_N-dimethylacetamide/testsuite-fragmenting-N_N-dimethylacetamide-order3.at \ 93 Fragmenting/N_N-dimethylacetamide/testsuite-fragmenting-N_N-dimethylacetamide-order4.at \ 94 Fragmenting/N_N-dimethylacetamide/testsuite-fragmenting-N_N-dimethylacetamide-order5.at \ 95 Fragmenting/N_N-dimethylacetamide/testsuite-fragmenting-N_N-dimethylacetamide-order6.at \ 96 Fragmenting/proline/testsuite-fragmenting-proline-order1.at \ 97 Fragmenting/proline/testsuite-fragmenting-proline-order2.at \ 98 Fragmenting/proline/testsuite-fragmenting-proline-order3.at \ 99 Fragmenting/proline/testsuite-fragmenting-proline-order4.at \ 100 Fragmenting/proline/testsuite-fragmenting-proline-order5.at \ 101 Fragmenting/proline/testsuite-fragmenting-proline-order6.at \ 102 Fragmenting/putrescine/testsuite-fragmenting-putrescine-order1.at \ 103 Fragmenting/putrescine/testsuite-fragmenting-putrescine-order2.at \ 104 Fragmenting/putrescine/testsuite-fragmenting-putrescine-order3.at \ 105 Fragmenting/putrescine/testsuite-fragmenting-putrescine-order4.at \ 106 Fragmenting/putrescine/testsuite-fragmenting-putrescine-order5.at \ 107 Fragmenting/putrescine/testsuite-fragmenting-putrescine-order6.at \ 108 Fragmenting/tartaric_acid/testsuite-fragmenting-tartaric_acid-order1.at \ 109 Fragmenting/tartaric_acid/testsuite-fragmenting-tartaric_acid-order2.at \ 110 Fragmenting/tartaric_acid/testsuite-fragmenting-tartaric_acid-order3.at \ 111 Fragmenting/tartaric_acid/testsuite-fragmenting-tartaric_acid-order4.at \ 112 Fragmenting/tartaric_acid/testsuite-fragmenting-tartaric_acid-order5.at \ 113 Fragmenting/tartaric_acid/testsuite-fragmenting-tartaric_acid-order6.at \ 114 Joining/heptan/testsuite-joining-heptan.at \ 115 Analyzing/heptan/testsuite-analyzing-heptan.at 110 116 111 117 max_jobs = 4 -
tests/Fragmentations/testsuite.at
r45f835 r9c27b0 11 11 12 12 # fragmentation of 1_2-dimethoxyethane 13 m4_include( 1_2-dimethoxyethane/testsuite-1_2-dimethoxyethane-order1.at)14 m4_include( 1_2-dimethoxyethane/testsuite-1_2-dimethoxyethane-order2.at)15 m4_include( 1_2-dimethoxyethane/testsuite-1_2-dimethoxyethane-order3.at)16 m4_include( 1_2-dimethoxyethane/testsuite-1_2-dimethoxyethane-order4.at)13 m4_include(Fragmenting/1_2-dimethoxyethane/testsuite-fragmenting-1_2-dimethoxyethane-order1.at) 14 m4_include(Fragmenting/1_2-dimethoxyethane/testsuite-fragmenting-1_2-dimethoxyethane-order2.at) 15 m4_include(Fragmenting/1_2-dimethoxyethane/testsuite-fragmenting-1_2-dimethoxyethane-order3.at) 16 m4_include(Fragmenting/1_2-dimethoxyethane/testsuite-fragmenting-1_2-dimethoxyethane-order4.at) 17 17 18 18 # fragmentation of 1_2-dimethylbenzene 19 m4_include( 1_2-dimethylbenzene/testsuite-1_2-dimethylbenzene-order1.at)20 m4_include( 1_2-dimethylbenzene/testsuite-1_2-dimethylbenzene-order2.at)21 m4_include( 1_2-dimethylbenzene/testsuite-1_2-dimethylbenzene-order3.at)22 m4_include( 1_2-dimethylbenzene/testsuite-1_2-dimethylbenzene-order4.at)19 m4_include(Fragmenting/1_2-dimethylbenzene/testsuite-fragmenting-1_2-dimethylbenzene-order1.at) 20 m4_include(Fragmenting/1_2-dimethylbenzene/testsuite-fragmenting-1_2-dimethylbenzene-order2.at) 21 m4_include(Fragmenting/1_2-dimethylbenzene/testsuite-fragmenting-1_2-dimethylbenzene-order3.at) 22 m4_include(Fragmenting/1_2-dimethylbenzene/testsuite-fragmenting-1_2-dimethylbenzene-order4.at) 23 23 24 24 # fragmentation of 2-methylcyclohexanone 25 m4_include( 2-methylcyclohexanone/testsuite-2-methylcyclohexanone-order1.at)26 m4_include( 2-methylcyclohexanone/testsuite-2-methylcyclohexanone-order2.at)27 m4_include( 2-methylcyclohexanone/testsuite-2-methylcyclohexanone-order3.at)28 m4_include( 2-methylcyclohexanone/testsuite-2-methylcyclohexanone-order4.at)25 m4_include(Fragmenting/2-methylcyclohexanone/testsuite-fragmenting-2-methylcyclohexanone-order1.at) 26 m4_include(Fragmenting/2-methylcyclohexanone/testsuite-fragmenting-2-methylcyclohexanone-order2.at) 27 m4_include(Fragmenting/2-methylcyclohexanone/testsuite-fragmenting-2-methylcyclohexanone-order3.at) 28 m4_include(Fragmenting/2-methylcyclohexanone/testsuite-fragmenting-2-methylcyclohexanone-order4.at) 29 29 30 30 # fragmentation of benzene 31 m4_include( benzene/testsuite-benzene-order1.at)32 m4_include( benzene/testsuite-benzene-order2.at)33 m4_include( benzene/testsuite-benzene-order3.at)34 m4_include( benzene/testsuite-benzene-order4.at)35 m4_include( benzene/testsuite-benzene-order5.at)36 m4_include( benzene/testsuite-benzene-order6.at)31 m4_include(Fragmenting/benzene/testsuite-fragmenting-benzene-order1.at) 32 m4_include(Fragmenting/benzene/testsuite-fragmenting-benzene-order2.at) 33 m4_include(Fragmenting/benzene/testsuite-fragmenting-benzene-order3.at) 34 m4_include(Fragmenting/benzene/testsuite-fragmenting-benzene-order4.at) 35 m4_include(Fragmenting/benzene/testsuite-fragmenting-benzene-order5.at) 36 m4_include(Fragmenting/benzene/testsuite-fragmenting-benzene-order6.at) 37 37 38 38 # fragmentation of cholesterol 39 m4_include( cholesterol/testsuite-cholesterol-order1.at)40 m4_include( cholesterol/testsuite-cholesterol-order2.at)41 m4_include( cholesterol/testsuite-cholesterol-order3.at)42 m4_include( cholesterol/testsuite-cholesterol-order4.at)39 m4_include(Fragmenting/cholesterol/testsuite-fragmenting-cholesterol-order1.at) 40 m4_include(Fragmenting/cholesterol/testsuite-fragmenting-cholesterol-order2.at) 41 m4_include(Fragmenting/cholesterol/testsuite-fragmenting-cholesterol-order3.at) 42 m4_include(Fragmenting/cholesterol/testsuite-fragmenting-cholesterol-order4.at) 43 43 44 44 # fragmentation of cycloheptane 45 m4_include( cycloheptane/testsuite-cycloheptane-order1.at)46 m4_include( cycloheptane/testsuite-cycloheptane-order2.at)47 m4_include( cycloheptane/testsuite-cycloheptane-order3.at)48 m4_include( cycloheptane/testsuite-cycloheptane-order4.at)49 m4_include( cycloheptane/testsuite-cycloheptane-order5.at)50 m4_include( cycloheptane/testsuite-cycloheptane-order6.at)45 m4_include(Fragmenting/cycloheptane/testsuite-fragmenting-cycloheptane-order1.at) 46 m4_include(Fragmenting/cycloheptane/testsuite-fragmenting-cycloheptane-order2.at) 47 m4_include(Fragmenting/cycloheptane/testsuite-fragmenting-cycloheptane-order3.at) 48 m4_include(Fragmenting/cycloheptane/testsuite-fragmenting-cycloheptane-order4.at) 49 m4_include(Fragmenting/cycloheptane/testsuite-fragmenting-cycloheptane-order5.at) 50 m4_include(Fragmenting/cycloheptane/testsuite-fragmenting-cycloheptane-order6.at) 51 51 52 52 # fragmentation of dimethyl_bromomalonate 53 m4_include( dimethyl_bromomalonate/testsuite-dimethyl_bromomalonate-order1.at)54 m4_include( dimethyl_bromomalonate/testsuite-dimethyl_bromomalonate-order2.at)55 m4_include( dimethyl_bromomalonate/testsuite-dimethyl_bromomalonate-order3.at)56 m4_include( dimethyl_bromomalonate/testsuite-dimethyl_bromomalonate-order4.at)57 m4_include( dimethyl_bromomalonate/testsuite-dimethyl_bromomalonate-order5.at)58 m4_include( dimethyl_bromomalonate/testsuite-dimethyl_bromomalonate-order6.at)53 m4_include(Fragmenting/dimethyl_bromomalonate/testsuite-fragmenting-dimethyl_bromomalonate-order1.at) 54 m4_include(Fragmenting/dimethyl_bromomalonate/testsuite-fragmenting-dimethyl_bromomalonate-order2.at) 55 m4_include(Fragmenting/dimethyl_bromomalonate/testsuite-fragmenting-dimethyl_bromomalonate-order3.at) 56 m4_include(Fragmenting/dimethyl_bromomalonate/testsuite-fragmenting-dimethyl_bromomalonate-order4.at) 57 m4_include(Fragmenting/dimethyl_bromomalonate/testsuite-fragmenting-dimethyl_bromomalonate-order5.at) 58 m4_include(Fragmenting/dimethyl_bromomalonate/testsuite-fragmenting-dimethyl_bromomalonate-order6.at) 59 59 60 60 # fragmentation of glucose 61 m4_include( glucose/testsuite-glucose-order1.at)62 m4_include( glucose/testsuite-glucose-order2.at)63 m4_include( glucose/testsuite-glucose-order3.at)64 m4_include( glucose/testsuite-glucose-order4.at)65 m4_include( glucose/testsuite-glucose-order5.at)66 m4_include( glucose/testsuite-glucose-order6.at)61 m4_include(Fragmenting/glucose/testsuite-fragmenting-glucose-order1.at) 62 m4_include(Fragmenting/glucose/testsuite-fragmenting-glucose-order2.at) 63 m4_include(Fragmenting/glucose/testsuite-fragmenting-glucose-order3.at) 64 m4_include(Fragmenting/glucose/testsuite-fragmenting-glucose-order4.at) 65 m4_include(Fragmenting/glucose/testsuite-fragmenting-glucose-order5.at) 66 m4_include(Fragmenting/glucose/testsuite-fragmenting-glucose-order6.at) 67 67 68 68 # fragmentation of heptan 69 m4_include( heptan/testsuite-heptan-order1.at)70 m4_include( heptan/testsuite-heptan-order2.at)71 m4_include( heptan/testsuite-heptan-order3.at)72 m4_include( heptan/testsuite-heptan-order4.at)69 m4_include(Fragmenting/heptan/testsuite-fragmenting-heptan-order1.at) 70 m4_include(Fragmenting/heptan/testsuite-fragmenting-heptan-order2.at) 71 m4_include(Fragmenting/heptan/testsuite-fragmenting-heptan-order3.at) 72 m4_include(Fragmenting/heptan/testsuite-fragmenting-heptan-order4.at) 73 73 74 74 # fragmentation of isoleucine 75 m4_include( isoleucine/testsuite-isoleucine-order1.at)76 m4_include( isoleucine/testsuite-isoleucine-order2.at)77 m4_include( isoleucine/testsuite-isoleucine-order3.at)78 m4_include( isoleucine/testsuite-isoleucine-order4.at)79 m4_include( isoleucine/testsuite-isoleucine-order5.at)80 m4_include( isoleucine/testsuite-isoleucine-order6.at)75 m4_include(Fragmenting/isoleucine/testsuite-fragmenting-isoleucine-order1.at) 76 m4_include(Fragmenting/isoleucine/testsuite-fragmenting-isoleucine-order2.at) 77 m4_include(Fragmenting/isoleucine/testsuite-fragmenting-isoleucine-order3.at) 78 m4_include(Fragmenting/isoleucine/testsuite-fragmenting-isoleucine-order4.at) 79 m4_include(Fragmenting/isoleucine/testsuite-fragmenting-isoleucine-order5.at) 80 m4_include(Fragmenting/isoleucine/testsuite-fragmenting-isoleucine-order6.at) 81 81 82 82 # fragmentation of neohexane 83 m4_include( neohexane/testsuite-neohexane-order1.at)84 m4_include( neohexane/testsuite-neohexane-order2.at)85 m4_include( neohexane/testsuite-neohexane-order3.at)86 m4_include( neohexane/testsuite-neohexane-order4.at)87 m4_include( neohexane/testsuite-neohexane-order5.at)88 m4_include( neohexane/testsuite-neohexane-order6.at)83 m4_include(Fragmenting/neohexane/testsuite-fragmenting-neohexane-order1.at) 84 m4_include(Fragmenting/neohexane/testsuite-fragmenting-neohexane-order2.at) 85 m4_include(Fragmenting/neohexane/testsuite-fragmenting-neohexane-order3.at) 86 m4_include(Fragmenting/neohexane/testsuite-fragmenting-neohexane-order4.at) 87 m4_include(Fragmenting/neohexane/testsuite-fragmenting-neohexane-order5.at) 88 m4_include(Fragmenting/neohexane/testsuite-fragmenting-neohexane-order6.at) 89 89 90 90 # fragmentation of N_N-dimethylacetamide 91 m4_include( N_N-dimethylacetamide/testsuite-N_N-dimethylacetamide-order1.at)92 m4_include( N_N-dimethylacetamide/testsuite-N_N-dimethylacetamide-order2.at)93 m4_include( N_N-dimethylacetamide/testsuite-N_N-dimethylacetamide-order3.at)94 m4_include( N_N-dimethylacetamide/testsuite-N_N-dimethylacetamide-order4.at)95 m4_include( N_N-dimethylacetamide/testsuite-N_N-dimethylacetamide-order5.at)96 m4_include( N_N-dimethylacetamide/testsuite-N_N-dimethylacetamide-order6.at)91 m4_include(Fragmenting/N_N-dimethylacetamide/testsuite-fragmenting-N_N-dimethylacetamide-order1.at) 92 m4_include(Fragmenting/N_N-dimethylacetamide/testsuite-fragmenting-N_N-dimethylacetamide-order2.at) 93 m4_include(Fragmenting/N_N-dimethylacetamide/testsuite-fragmenting-N_N-dimethylacetamide-order3.at) 94 m4_include(Fragmenting/N_N-dimethylacetamide/testsuite-fragmenting-N_N-dimethylacetamide-order4.at) 95 m4_include(Fragmenting/N_N-dimethylacetamide/testsuite-fragmenting-N_N-dimethylacetamide-order5.at) 96 m4_include(Fragmenting/N_N-dimethylacetamide/testsuite-fragmenting-N_N-dimethylacetamide-order6.at) 97 97 98 98 # fragmentation of proline 99 m4_include( proline/testsuite-proline-order1.at)100 m4_include( proline/testsuite-proline-order2.at)101 m4_include( proline/testsuite-proline-order3.at)102 m4_include( proline/testsuite-proline-order4.at)103 m4_include( proline/testsuite-proline-order5.at)104 m4_include( proline/testsuite-proline-order6.at)99 m4_include(Fragmenting/proline/testsuite-fragmenting-proline-order1.at) 100 m4_include(Fragmenting/proline/testsuite-fragmenting-proline-order2.at) 101 m4_include(Fragmenting/proline/testsuite-fragmenting-proline-order3.at) 102 m4_include(Fragmenting/proline/testsuite-fragmenting-proline-order4.at) 103 m4_include(Fragmenting/proline/testsuite-fragmenting-proline-order5.at) 104 m4_include(Fragmenting/proline/testsuite-fragmenting-proline-order6.at) 105 105 106 106 # fragmentation of putrescine 107 m4_include( putrescine/testsuite-putrescine-order1.at)108 m4_include( putrescine/testsuite-putrescine-order2.at)109 m4_include( putrescine/testsuite-putrescine-order3.at)110 m4_include( putrescine/testsuite-putrescine-order4.at)111 m4_include( putrescine/testsuite-putrescine-order5.at)112 m4_include( putrescine/testsuite-putrescine-order6.at)107 m4_include(Fragmenting/putrescine/testsuite-fragmenting-putrescine-order1.at) 108 m4_include(Fragmenting/putrescine/testsuite-fragmenting-putrescine-order2.at) 109 m4_include(Fragmenting/putrescine/testsuite-fragmenting-putrescine-order3.at) 110 m4_include(Fragmenting/putrescine/testsuite-fragmenting-putrescine-order4.at) 111 m4_include(Fragmenting/putrescine/testsuite-fragmenting-putrescine-order5.at) 112 m4_include(Fragmenting/putrescine/testsuite-fragmenting-putrescine-order6.at) 113 113 114 114 # fragmentation of tartaric_acid 115 m4_include(tartaric_acid/testsuite-tartaric_acid-order1.at) 116 m4_include(tartaric_acid/testsuite-tartaric_acid-order2.at) 117 m4_include(tartaric_acid/testsuite-tartaric_acid-order3.at) 118 m4_include(tartaric_acid/testsuite-tartaric_acid-order4.at) 119 m4_include(tartaric_acid/testsuite-tartaric_acid-order5.at) 120 m4_include(tartaric_acid/testsuite-tartaric_acid-order6.at) 115 m4_include(Fragmenting/tartaric_acid/testsuite-fragmenting-tartaric_acid-order1.at) 116 m4_include(Fragmenting/tartaric_acid/testsuite-fragmenting-tartaric_acid-order2.at) 117 m4_include(Fragmenting/tartaric_acid/testsuite-fragmenting-tartaric_acid-order3.at) 118 m4_include(Fragmenting/tartaric_acid/testsuite-fragmenting-tartaric_acid-order4.at) 119 m4_include(Fragmenting/tartaric_acid/testsuite-fragmenting-tartaric_acid-order5.at) 120 m4_include(Fragmenting/tartaric_acid/testsuite-fragmenting-tartaric_acid-order6.at) 121 122 # Joining of heptan 123 m4_include(Joining/heptan/testsuite-joining-heptan.at) 124 125 # Analyzing of heptan 126 m4_include(Analyzing/heptan/testsuite-analyzing-heptan.at) -
tests/Makefile.am
r45f835 r9c27b0 1 SUBDIRS = CodeChecks regression Fragmentations Tesselations 1 SUBDIRS = \ 2 CodeChecks \ 3 regression \ 4 Fragmentations \ 5 Tesselations 2 6 -
tests/regression/Options/BondLengthTable/testsuite-options-bond-length-table.at
r45f835 r9c27b0 16 16 17 17 AT_SETUP([Standard Options - bond length table with Undo]) 18 AT_XFAIL_IF([/bin/true])19 18 AT_KEYWORDS([options bond-table undo]) 20 19 … … 31 30 32 31 AT_SETUP([Standard Options - bond length table with Redo]) 33 AT_XFAIL_IF([/bin/true])34 32 AT_KEYWORDS([options bond-table redo]) 35 33
Note:
See TracChangeset
for help on using the changeset viewer.