source: src/unittests/tesselation_insideoutsideunittest.cpp@ 5f612ee

Action_Thermostats Add_AtomRandomPerturbation Add_FitFragmentPartialChargesAction Add_RotateAroundBondAction Add_SelectAtomByNameAction Added_ParseSaveFragmentResults AddingActions_SaveParseParticleParameters Adding_Graph_to_ChangeBondActions Adding_MD_integration_tests Adding_ParticleName_to_Atom Adding_StructOpt_integration_tests AtomFragments Automaking_mpqc_open AutomationFragmentation_failures Candidate_v1.5.4 Candidate_v1.6.0 Candidate_v1.6.1 ChangeBugEmailaddress ChangingTestPorts ChemicalSpaceEvaluator CombiningParticlePotentialParsing Combining_Subpackages Debian_Package_split Debian_package_split_molecuildergui_only Disabling_MemDebug Docu_Python_wait EmpiricalPotential_contain_HomologyGraph EmpiricalPotential_contain_HomologyGraph_documentation Enable_parallel_make_install Enhance_userguide Enhanced_StructuralOptimization Enhanced_StructuralOptimization_continued Example_ManyWaysToTranslateAtom Exclude_Hydrogens_annealWithBondGraph FitPartialCharges_GlobalError Fix_BoundInBox_CenterInBox_MoleculeActions Fix_ChargeSampling_PBC Fix_ChronosMutex Fix_FitPartialCharges Fix_FitPotential_needs_atomicnumbers Fix_ForceAnnealing Fix_IndependentFragmentGrids Fix_ParseParticles Fix_ParseParticles_split_forward_backward_Actions Fix_PopActions Fix_QtFragmentList_sorted_selection Fix_Restrictedkeyset_FragmentMolecule Fix_StatusMsg Fix_StepWorldTime_single_argument Fix_Verbose_Codepatterns Fix_fitting_potentials Fixes ForceAnnealing_goodresults ForceAnnealing_oldresults ForceAnnealing_tocheck ForceAnnealing_with_BondGraph ForceAnnealing_with_BondGraph_continued ForceAnnealing_with_BondGraph_continued_betteresults ForceAnnealing_with_BondGraph_contraction-expansion FragmentAction_writes_AtomFragments FragmentMolecule_checks_bonddegrees GeometryObjects Gui_Fixes Gui_displays_atomic_force_velocity ImplicitCharges IndependentFragmentGrids IndependentFragmentGrids_IndividualZeroInstances IndependentFragmentGrids_IntegrationTest IndependentFragmentGrids_Sole_NN_Calculation JobMarket_RobustOnKillsSegFaults JobMarket_StableWorkerPool JobMarket_unresolvable_hostname_fix MoreRobust_FragmentAutomation ODR_violation_mpqc_open PartialCharges_OrthogonalSummation PdbParser_setsAtomName PythonUI_with_named_parameters QtGui_reactivate_TimeChanged_changes Recreated_GuiChecks Rewrite_FitPartialCharges RotateToPrincipalAxisSystem_UndoRedo SaturateAtoms_findBestMatching SaturateAtoms_singleDegree StoppableMakroAction Subpackage_CodePatterns Subpackage_JobMarket Subpackage_LinearAlgebra Subpackage_levmar Subpackage_mpqc_open Subpackage_vmg Switchable_LogView ThirdParty_MPQC_rebuilt_buildsystem TrajectoryDependenant_MaxOrder TremoloParser_IncreasedPrecision TremoloParser_MultipleTimesteps TremoloParser_setsAtomName Ubuntu_1604_changes stable
Last change on this file since 5f612ee was 5f612ee, 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: 6.1 KB
Line 
1/*
2 * tesselation_insideoutsideunittest.cpp
3 *
4 * Created on: Dec 28, 2009
5 * Author: heber
6 */
7
8using namespace std;
9
10#include <cppunit/CompilerOutputter.h>
11#include <cppunit/extensions/TestFactoryRegistry.h>
12#include <cppunit/ui/text/TestRunner.h>
13
14#include <cstring>
15
16#include "defs.hpp"
17#include "tesselation.hpp"
18#include "tesselation_insideoutsideunittest.hpp"
19
20#ifdef HAVE_TESTRUNNER
21#include "UnitTestMain.hpp"
22#endif /*HAVE_TESTRUNNER*/
23
24#define SPHERERADIUS 2.
25
26/********************************************** Test classes **************************************/
27
28// Registers the fixture into the 'registry'
29CPPUNIT_TEST_SUITE_REGISTRATION( TesselationInOutsideTest );
30
31
32void TesselationInOutsideTest::setUp()
33{
34 setVerbosity(2);
35
36 // create corners
37 class TesselPoint *Walker;
38 Walker = new TesselPoint;
39 Walker->node = new Vector(0., 0., 0.);
40 Walker->Name = Malloc<char>(3, "TesselationInOutsideTest::setUp - *Name");
41 strcpy(Walker->Name, "1");
42 Walker->nr = 1;
43 Corners.push_back(Walker);
44 Walker = new TesselPoint;
45 Walker->node = new Vector(0., 1., 0.);
46 Walker->Name = Malloc<char>(3, "TesselationInOutsideTest::setUp - *Name");
47 strcpy(Walker->Name, "2");
48 Walker->nr = 2;
49 Corners.push_back(Walker);
50 Walker = new TesselPoint;
51 Walker->node = new Vector(1., 0., 0.);
52 Walker->Name = Malloc<char>(3, "TesselationInOutsideTest::setUp - *Name");
53 strcpy(Walker->Name, "3");
54 Walker->nr = 3;
55 Corners.push_back(Walker);
56 Walker = new TesselPoint;
57 Walker->node = new Vector(1., 1., 0.);
58 Walker->Name = Malloc<char>(3, "TesselationInOutsideTest::setUp - *Name");
59 strcpy(Walker->Name, "4");
60 Walker->nr = 4;
61 Corners.push_back(Walker);
62 Walker = new TesselPoint;
63 Walker->node = new Vector(0., 0., 1.);
64 Walker->Name = Malloc<char>(3, "TesselationInOutsideTest::setUp - *Name");
65 strcpy(Walker->Name, "5");
66 Walker->nr = 5;
67 Corners.push_back(Walker);
68 Walker = new TesselPoint;
69 Walker->node = new Vector(0., 1., 1.);
70 Walker->Name = Malloc<char>(3, "TesselationInOutsideTest::setUp - *Name");
71 strcpy(Walker->Name, "6");
72 Walker->nr = 6;
73 Corners.push_back(Walker);
74 Walker = new TesselPoint;
75 Walker->node = new Vector(1., 0., 1.);
76 Walker->Name = Malloc<char>(3, "TesselationInOutsideTest::setUp - *Name");
77 strcpy(Walker->Name, "7");
78 Walker->nr = 7;
79 Corners.push_back(Walker);
80 Walker = new TesselPoint;
81 Walker->node = new Vector(1., 1., 1.);
82 Walker->Name = Malloc<char>(3, "TesselationInOutsideTest::setUp - *Name");
83 strcpy(Walker->Name, "8");
84 Walker->nr = 8;
85 Corners.push_back(Walker);
86
87 // create linkedcell
88 LinkedList = new LinkedCell(&Corners, 2.*SPHERERADIUS);
89
90 // create tesselation
91 TesselStruct = new Tesselation;
92 TesselStruct->FindStartingTriangle(SPHERERADIUS, LinkedList);
93
94 CandidateForTesselation *baseline = NULL;
95 BoundaryTriangleSet *T = NULL;
96 bool OneLoopWithoutSuccessFlag = true;
97 bool TesselationFailFlag = false;
98 while ((!TesselStruct->OpenLines.empty()) && (OneLoopWithoutSuccessFlag)) {
99 // 2a. fill all new OpenLines
100 DoLog(1) && (Log() << Verbose(1) << "There are " << TesselStruct->OpenLines.size() << " open lines to scan for candidates:" << endl);
101 for (CandidateMap::iterator Runner = TesselStruct->OpenLines.begin(); Runner != TesselStruct->OpenLines.end(); Runner++)
102 DoLog(2) && (Log() << Verbose(2) << *(Runner->second) << endl);
103
104 for (CandidateMap::iterator Runner = TesselStruct->OpenLines.begin(); Runner != TesselStruct->OpenLines.end(); Runner++) {
105 baseline = Runner->second;
106 if (baseline->pointlist.empty()) {
107 T = (((baseline->BaseLine->triangles.begin()))->second);
108 DoLog(1) && (Log() << Verbose(1) << "Finding best candidate for open line " << *baseline->BaseLine << " of triangle " << *T << endl);
109 TesselationFailFlag = TesselStruct->FindNextSuitableTriangle(*baseline, *T, SPHERERADIUS, LinkedList); //the line is there, so there is a triangle, but only one.
110 }
111 }
112
113 // 2b. search for smallest ShortestAngle among all candidates
114 double ShortestAngle = 4.*M_PI;
115 DoLog(1) && (Log() << Verbose(1) << "There are " << TesselStruct->OpenLines.size() << " open lines to scan for the best candidates:" << endl);
116 for (CandidateMap::iterator Runner = TesselStruct->OpenLines.begin(); Runner != TesselStruct->OpenLines.end(); Runner++)
117 DoLog(2) && (Log() << Verbose(2) << *(Runner->second) << endl);
118
119 for (CandidateMap::iterator Runner = TesselStruct->OpenLines.begin(); Runner != TesselStruct->OpenLines.end(); Runner++) {
120 if (Runner->second->ShortestAngle < ShortestAngle) {
121 baseline = Runner->second;
122 ShortestAngle = baseline->ShortestAngle;
123 //Log() << Verbose(1) << "New best candidate is " << *baseline->BaseLine << " with point " << *baseline->point << " and angle " << baseline->ShortestAngle << endl;
124 }
125 }
126 if ((ShortestAngle == 4.*M_PI) || (baseline->pointlist.empty()))
127 OneLoopWithoutSuccessFlag = false;
128 else {
129 TesselStruct->AddCandidatePolygon(*baseline, SPHERERADIUS, LinkedList);
130 }
131 }
132};
133
134
135void TesselationInOutsideTest::tearDown()
136{
137 delete(LinkedList);
138 delete(TesselStruct);
139 for (LinkedCell::LinkedNodes::iterator Runner = Corners.begin(); Runner != Corners.end(); Runner++) {
140 delete((*Runner)->node);
141 delete(*Runner);
142 }
143 Corners.clear();
144 MemoryUsageObserver::purgeInstance();
145 logger::purgeInstance();
146 errorLogger::purgeInstance();
147};
148
149/** UnitTest for Tesselation::IsInnerPoint()
150 */
151void TesselationInOutsideTest::IsInnerPointTest()
152{
153 double n[3];
154 const double boundary = 2.;
155 const double step = 1.;
156
157 // go through the mesh and check each point
158 for (n[0] = -boundary; n[0] <= boundary; n[0]+=step)
159 for (n[1] = -boundary; n[1] <= boundary; n[1]+=step)
160 for (n[2] = -boundary; n[2] <= boundary; n[2]+=step) {
161 if ( ((n[0] >= 0.) && (n[1] >= 0.) && (n[2] >= 0.)) && ((n[0] <= 1.) && (n[1] <= 1.) && (n[2] <= 1.)))
162 CPPUNIT_ASSERT_EQUAL( true , TesselStruct->IsInnerPoint(Vector(n[0], n[1], n[2]), LinkedList) );
163 else
164 CPPUNIT_ASSERT_EQUAL( false , TesselStruct->IsInnerPoint(Vector(n[0], n[1], n[2]), LinkedList) );
165 }
166};
Note: See TracBrowser for help on using the repository browser.