|
Last change
on this file since 90c4460 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:
1.1 KB
|
| Line | |
|---|
| 1 | /*
|
|---|
| 2 | * tesselation_boundarytriangleunittest.hpp
|
|---|
| 3 | *
|
|---|
| 4 | * Created on: Jan 13, 2010
|
|---|
| 5 | * Author: heber
|
|---|
| 6 | */
|
|---|
| 7 |
|
|---|
| 8 | #ifndef TESSELATION_BOUNDARYTRIANGLEUNITTEST_HPP_
|
|---|
| 9 | #define TESSELATION_BOUNDARYTRIANGLEUNITTEST_HPP_
|
|---|
| 10 |
|
|---|
| 11 | /*********************************************** includes ***********************************/
|
|---|
| 12 |
|
|---|
| 13 | #include <cppunit/extensions/HelperMacros.h>
|
|---|
| 14 |
|
|---|
| 15 | #include "linkedcell.hpp"
|
|---|
| 16 | #include "tesselation.hpp"
|
|---|
| 17 |
|
|---|
| 18 | /********************************************** Test classes **************************************/
|
|---|
| 19 |
|
|---|
| 20 | class TesselationBoundaryTriangleTest : public CppUnit::TestFixture
|
|---|
| 21 | {
|
|---|
| 22 | CPPUNIT_TEST_SUITE( TesselationBoundaryTriangleTest) ;
|
|---|
| 23 | CPPUNIT_TEST ( GetClosestPointOnPlaneTest );
|
|---|
| 24 | CPPUNIT_TEST ( GetClosestPointOffPlaneTest );
|
|---|
| 25 | CPPUNIT_TEST_SUITE_END();
|
|---|
| 26 |
|
|---|
| 27 | public:
|
|---|
| 28 | void setUp();
|
|---|
| 29 | void tearDown();
|
|---|
| 30 | void GetClosestPointOnPlaneTest();
|
|---|
| 31 | void GetClosestPointOffPlaneTest();
|
|---|
| 32 |
|
|---|
| 33 | private:
|
|---|
| 34 | class BoundaryTriangleSet *triangle;
|
|---|
| 35 | class BoundaryLineSet *lines[3];
|
|---|
| 36 | class BoundaryPointSet *points[3];
|
|---|
| 37 | class TesselPoint *tesselpoints[3];
|
|---|
| 38 | LinkedCell::LinkedNodes Corners;
|
|---|
| 39 | };
|
|---|
| 40 |
|
|---|
| 41 |
|
|---|
| 42 | #endif /* TESSELATION_BOUNDARYTRIANGLEUNITTEST_HPP_ */
|
|---|
Note:
See
TracBrowser
for help on using the repository browser.
