Changes in / [0c5eeb:326bbe]

Location:

src

Files:

• Descriptors/AtomDescriptor.cpp (modified) (1 diff)
• Descriptors/MoleculeDescriptor.cpp (modified) (1 diff)
• Helpers/MemDebug.cpp (modified) (1 diff)
• Patterns/Singleton.hpp (modified) (3 diffs)
• Patterns/Singleton_impl.hpp (modified) (2 diffs)
• UIElements/Dialog.cpp (modified) (1 diff)
• World.cpp (modified) (5 diffs)
• molecule.cpp (modified) (1 diff)
• tesselation.cpp (modified) (3 diffs)
• unittests/Makefile.am (modified) (1 diff)
• unittests/ObserverTest.cpp (modified) (2 diffs)
• unittests/manipulateAtomsTest.cpp (modified) (3 diffs)

src/Descriptors/AtomDescriptor.cpp

@@ -12 +12 @@
 
 #include "World.hpp"
+
 #include "atom.hpp"
 
 #include <boost/bind.hpp>
-
+#include <cassert>
 #include <iostream>
 

src/Descriptors/MoleculeDescriptor.cpp

@@ -16 +16 @@
 
 #include <boost/bind.hpp>
+#include <cassert>
 #include <iostream>
 

src/Helpers/MemDebug.cpp

@@ -6 +6 @@
  */
 
-#ifndef NDEBUG
+#ifndef NDBEGUG
 #ifndef NO_MEMDEBUG
 

src/Patterns/Singleton.hpp

@@ -9 +9 @@
 #define SINGLETON_HPP_
 
+#include <cassert>
 #include <boost/thread.hpp>
 
-#include "Helpers/Assert.hpp"
 #include "defs.hpp"
 
@@ -181 +181 @@
 
     inline static void set(creator_T*&,creator_T*){
-      ASSERT(0, "Cannot set the Instance for a singleton of this type");
+      assert(0 && "Cannot set the Instance for a singleton of this type");
     }
   };
@@ -191 +191 @@
   struct creator_t<creator_T,false>{
     inline static creator_T* make(){
-      ASSERT(0, "Cannot create a singleton of this type directly");
-      return 0;
+      assert(0 && "Cannot create a singleton of this type directly");
     }
     inline static void set(ptr_t& dest,creator_T* src){

src/Patterns/Singleton_impl.hpp

@@ -72 +72 @@
 template <class T,bool _may_create>
 void Singleton<T,_may_create>::setInstance(T* newInstance){
-  ASSERT(!theInstance.get(), "Trying to set the instance of an already created singleton");
+  assert(!theInstance.get() && "Trying to set the instance of an already created singleton");
   boost::recursive_mutex::scoped_lock guard(instanceLock);
   theInstance.reset(newInstance);
@@ -83 +83 @@
 template <class T, bool _may_create>
 Singleton<T,_may_create>::Singleton(const Singleton<T,_may_create>&){
-  ASSERT(0, "Copy constructor of singleton template called");
+  assert(0 && "Copy constructor of singleton template called");
 }
 

src/UIElements/Dialog.cpp

@@ -7 +7 @@
 
 #include "Helpers/MemDebug.hpp"
+
+#include <cassert>
 
 #include "Dialog.hpp"

src/World.cpp

@@ -21 +21 @@
 #include "Descriptors/SelectiveIterator_impl.hpp"
 #include "Actions/ManipulateAtomsProcess.hpp"
-#include "Helpers/Assert.hpp"
 
 #include "Patterns/Singleton_impl.hpp"
@@ -113 +112 @@
   molecule *mol = NULL;
   mol = NewMolecule();
-  ASSERT(!molecules.count(currMoleculeId),"currMoleculeId did not specify an unused ID");
+  cout << "Creating molecule with id " << currMoleculeId << "." << endl;
+  assert(!molecules.count(currMoleculeId));
   mol->setId(currMoleculeId++);
   // store the molecule by ID
@@ -129 +129 @@
   OBSERVE;
   molecule *mol = molecules[id];
-  ASSERT(mol,"Molecule id that was meant to be destroyed did not exist");
+  assert(mol);
   DeleteMolecule(mol);
   molecules.erase(id);
@@ -165 +165 @@
   OBSERVE;
   atom *atom = atoms[id];
-  ASSERT(atom,"Atom ID that was meant to be destroyed did not exist");
+  assert(atom);
   DeleteAtom(atom);
   atoms.erase(id);
@@ -177 +177 @@
   if(!target){
     target = atoms[oldId];
-    ASSERT(target,"Atom with that ID not found");
+    assert(target && "Atom with that ID not found");
     return target->changeId(newId);
   }

src/molecule.cpp

@@ -155 +155 @@
 molecule::const_iterator molecule::erase( atom * key )
 {
+  cout << "trying to erase atom" << endl;
   molecule::const_iterator iter = find(key);
   if (iter != end()){

src/tesselation.cpp

@@ -9 +9 @@
 
 #include <fstream>
+#include <assert.h>
 
 #include "helpers.hpp"
@@ -23 +24 @@
 #include "Plane.hpp"
 #include "Exceptions/LinearDependenceException.hpp"
+#include "Helpers/Assert.hpp"
+
 #include "Helpers/Assert.hpp"
 
@@ -2524 +2527 @@
     baseline = Runner->second;
     if (baseline->pointlist.empty()) {
-      ASSERT((baseline->BaseLine->triangles.size() == 1),"Open line without exactly one attached triangle");
+      assert((baseline->BaseLine->triangles.size() == 1) && ("Open line without exactly one attached triangle"));
       T = (((baseline->BaseLine->triangles.begin()))->second);
       DoLog(1) && (Log() << Verbose(1) << "Finding best candidate for open line " << *baseline->BaseLine << " of triangle " << *T << endl);

src/unittests/Makefile.am

@@ -211 +211 @@
 
 SingletonTest_SOURCES = UnitTestMain.cpp SingletonTest.cpp SingletonTest.hpp
-SingletonTest_LDADD = ${ALLLIBS} $(BOOST_LIB) ${BOOST_THREAD_LIB}
+SingletonTest_LDADD = $(BOOST_LIB) ${BOOST_THREAD_LIB}
 
 StackClassUnitTest_SOURCES = UnitTestMain.cpp stackclassunittest.cpp stackclassunittest.hpp

src/unittests/ObserverTest.cpp

@@ -382 +382 @@
   // make this Observable its own subject. NEVER DO THIS IN ACTUAL CODE
   simpleObservable1->signOn(simpleObservable1);
-#ifndef NDEBUG
   CPPUNIT_ASSERT_THROW(simpleObservable1->changeMethod(),Assert::AssertionFailure);
-#else
-  simpleObservable1->changeMethod();
-#endif
 
   // more complex test
@@ -392 +388 @@
   simpleObservable1->signOn(simpleObservable2);
   simpleObservable2->signOn(simpleObservable1);
-#ifndef NDEBUG
   CPPUNIT_ASSERT_THROW(simpleObservable1->changeMethod(),Assert::AssertionFailure);
-#else
-  simpleObservable1->changeMethod();
-#endif
-
-
   simpleObservable1->signOff(simpleObservable2);
   simpleObservable2->signOff(simpleObservable1);

src/unittests/manipulateAtomsTest.cpp

@@ -87 +87 @@
 static void operation(atom* _atom){
   AtomStub *atom = dynamic_cast<AtomStub*>(_atom);
-  CPPUNIT_ASSERT(atom);
+  assert(atom);
   atom->doSomething();
 }
@@ -100 +100 @@
     AtomStub *atom;
     atom = dynamic_cast<AtomStub*>(*iter);
-    CPPUNIT_ASSERT(atom);
+    assert(atom);
     CPPUNIT_ASSERT(atom->manipulated);
   }
@@ -114 +114 @@
     AtomStub *atom;
     atom = dynamic_cast<AtomStub*>(*iter);
-    CPPUNIT_ASSERT(atom);
+    assert(atom);
     if(atom->getId()!=(int)ATOM_COUNT/2)
       CPPUNIT_ASSERT(atom->manipulated);