Changeset 8d2772

Timestamp:

Mar 18, 2010, 4:45:41 PM (15 years ago)

Author:

Tillmann Crueger <crueger@…>

Branches:

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

Children:

80c63d

Parents:

24725c

Message:

Changed conditional criticalExit in constructor of BoundaryTriangleSet to Assertion.

Location:

src

Files:

• Helpers/Assert.cpp (modified) (1 diff)
• molecule.cpp (modified) (2 diffs)
• tesselation.cpp (modified) (5 diffs)
• unittests/AnalysisCorrelationToSurfaceUnitTest.cpp (modified) (2 diffs)

src/Helpers/Assert.cpp

@@ -21 +21 @@
 {
   if(!res){
-    cout << "Assertion " << condition << " failed in file " << filename << " at line " << line << endl;
+    cout << "Assertion \"" << condition << "\" failed in file " << filename << " at line " << line << endl;
     cout << "Assertion Message: " << message << std::endl;
     if(always_throw){

src/molecule.cpp

@@ -938 +938 @@
 void molecule::CountAtoms()
 {
-  cout << "!!!!!!!!!!! Assigning Numbers to atoms " << endl;
   int i = size();
   if ((AtomCount == 0) || (i != AtomCount)) {
@@ -961 +960 @@
     } else
       Log() << Verbose(3) << "AtomCount is still " << AtomCount << ", thus counting nothing." << endl;
-  }
-  else {
-    cout << "!!!!!!!!! Nothing changed while counting" << endl;
   }
 };

src/tesselation.cpp

@@ -16 +16 @@
 #include "vector.hpp"
 #include "verbose.hpp"
+
+#include "Helpers/Assert.hpp"
 
 class molecule;
@@ -366 +368 @@
     Counter++;
   }
-  if (Counter < 3) {
-    eLog() << Verbose(0) << "We have a triangle with only two distinct endpoints!" << endl;
-    performCriticalExit();
-  }
+  ASSERT(Counter >= 3,"We have a triangle with only two distinct endpoints!");
 };
 
@@ -2100 +2099 @@
     }
 
+
     BTS = NULL;
     AddCandidateTriangle(OptCandidates);
+
 //    delete(BaseLine.endpoints[0]);
 //    delete(BaseLine.endpoints[1]);
@@ -2431 +2432 @@
   // fill the set of neighbours
   TesselPointSet SetOfNeighbours;
+
   SetOfNeighbours.insert(CandidateLine.BaseLine->endpoints[1]->node);
   for (TesselPointList::iterator Runner = CandidateLine.pointlist.begin(); Runner != CandidateLine.pointlist.end(); Runner++)
@@ -2455 +2457 @@
 
     // add the triangles
-    BTS = new class BoundaryTriangleSet(BLS, TrianglesOnBoundaryCount);
+    BTS = new BoundaryTriangleSet(BLS, TrianglesOnBoundaryCount);
     AddTesselationTriangle();
     BTS->GetCenter(&Center);

src/unittests/AnalysisCorrelationToSurfaceUnitTest.cpp

@@ -26 +26 @@
 #include "tesselation.hpp"
 #include "World.hpp"
+#include "Helpers/Assert.hpp"
 
 #ifdef HAVE_TESTRUNNER
@@ -38 +39 @@
 void AnalysisCorrelationToSurfaceUnitTest::setUp()
 {
+  ASSERT_DO_THROW;
+
   atom *Walker = NULL;