|
Last change
on this file since 075729 was 075729, checked in by Frederik Heber <heber@…>, 15 years ago |
|
Merge branch 'Analysis_PairCorrelation' into StructureRefactoring
Conflicts:
molecuilder/src/Makefile.am
molecuilder/src/World.cpp
molecuilder/src/World.hpp
molecuilder/src/boundary.cpp
molecuilder/src/builder.cpp
molecuilder/src/log.cpp
molecuilder/src/moleculelist.cpp
molecuilder/src/periodentafel.cpp
molecuilder/src/tesselation.cpp
molecuilder/src/unittests/AnalysisCorrelationToSurfaceUnitTest.cpp
molecuilder/src/unittests/Makefile.am
molecuilder/src/unittests/bondgraphunittest.cpp
molecuilder/src/unittests/gslvectorunittest.cpp
molecuilder/src/unittests/logunittest.cpp
molecuilder/src/unittests/tesselation_boundarytriangleunittest.hpp
molecuilder/src/vector.cpp
molecuilder/tests/Tesselations/defs.in
Conflicts have been many and too numerous to listen here, just the few general cases
- new molecule() replaced by World::getInstance().createMolecule()
- new atom() replaced by World::getInstance().createAtom() where appropriate.
- Some DoLog()s added interfered with changes to the message produced by Log() << Verbose(.) << ...
- DoLog() has been erroneously added to TestRunner.cpp as well, there cout is appropriate
- ...
Additionally, there was a bug in atom::clone(), sort was set to atom::nr of the atom to clone not of the clone itself. This caused a failure of the fragmentation.
This merge has been fully checked from a clean build directory with subsequent configure,make all install and make check.
It configures, compiles and runs all test cases and the test suite without errors.
Signed-off-by: Frederik Heber <heber@…>
|
-
Property mode
set to
100644
|
|
File size:
784 bytes
|
| Line | |
|---|
| 1 | /*
|
|---|
| 2 | * atom_particleinfo.cpp
|
|---|
| 3 | *
|
|---|
| 4 | * Created on: Oct 19, 2009
|
|---|
| 5 | * Author: heber
|
|---|
| 6 | */
|
|---|
| 7 |
|
|---|
| 8 | #include "atom_particleinfo.hpp"
|
|---|
| 9 | #include "memoryallocator.hpp"
|
|---|
| 10 |
|
|---|
| 11 | /** Constructor of ParticleInfo.
|
|---|
| 12 | */
|
|---|
| 13 | ParticleInfo::ParticleInfo() : nr(-1), Name(NULL) {};
|
|---|
| 14 |
|
|---|
| 15 | ParticleInfo::ParticleInfo(ParticleInfo *pointer) :
|
|---|
| 16 | nr(pointer->nr),
|
|---|
| 17 | Name(pointer->Name)
|
|---|
| 18 | {}
|
|---|
| 19 |
|
|---|
| 20 |
|
|---|
| 21 | /** Destructor of ParticleInfo.
|
|---|
| 22 | */
|
|---|
| 23 | ParticleInfo::~ParticleInfo()
|
|---|
| 24 | {
|
|---|
| 25 | Free(&Name);
|
|---|
| 26 | };
|
|---|
| 27 |
|
|---|
| 28 | ostream & operator << (ostream &ost, const ParticleInfo &a)
|
|---|
| 29 | {
|
|---|
| 30 | if (a.Name == NULL)
|
|---|
| 31 | ost << "[NULL]";
|
|---|
| 32 | else
|
|---|
| 33 | ost << "[" << a.Name << "|" << &a << "]";
|
|---|
| 34 | return ost;
|
|---|
| 35 | };
|
|---|
| 36 |
|
|---|
| 37 | ostream & ParticleInfo::operator << (ostream &ost) const
|
|---|
| 38 | {
|
|---|
| 39 | if (Name == NULL)
|
|---|
| 40 | ost << "[NULL]";
|
|---|
| 41 | else
|
|---|
| 42 | ost << "[" << Name << "|" << this << "]";
|
|---|
| 43 | return ost;
|
|---|
| 44 | };
|
|---|
| 45 |
|
|---|
Note:
See
TracBrowser
for help on using the repository browser.
