Changes in src/World.cpp [70378e:97ebf8]

File:

• src/World.cpp (modified) (2 diffs)

src/World.cpp

@@ -1 +1 @@
 /*
- * world.cpp
+ * World.cpp
  *
- *  Created on: Mar 3, 2010
+ *  Created on: Feb 3, 2010
  *      Author: crueger
  */
@@ -8 +8 @@
 #include "World.hpp"
 
-double *World::cell_size = 0;
-
-/** Constructor of World.
- *
- */
-World::World()
+#include "atom.hpp"
+#include "config.hpp"
+#include "molecule.hpp"
+#include "periodentafel.hpp"
+#include "Descriptors/AtomDescriptor.hpp"
+#include "Descriptors/AtomDescriptor_impl.hpp"
+#include "Descriptors/MoleculeDescriptor.hpp"
+#include "Descriptors/MoleculeDescriptor_impl.hpp"
+#include "Descriptors/SelectiveIterator_impl.hpp"
+#include "Actions/ManipulateAtomsProcess.hpp"
+
+#include "Patterns/Singleton_impl.hpp"
+
+using namespace std;
+
+/******************************* getter and setter ************************/
+periodentafel *&World::getPeriode(){
+  return periode;
+}
+
+config *&World::getConfig(){
+  return configuration;
+}
+
+// Atoms
+
+atom* World::getAtom(AtomDescriptor descriptor){
+  return descriptor.find();
+}
+
+vector<atom*> World::getAllAtoms(AtomDescriptor descriptor){
+  return descriptor.findAll();
+}
+
+vector<atom*> World::getAllAtoms(){
+  return getAllAtoms(AllAtoms());
+}
+
+int World::numAtoms(){
+  return atoms.size();
+}
+
+// Molecules
+
+molecule *World::getMolecule(MoleculeDescriptor descriptor){
+  return descriptor.find();
+}
+
+std::vector<molecule*> World::getAllMolecules(MoleculeDescriptor descriptor){
+  return descriptor.findAll();
+}
+
+std::vector<molecule*> World::getAllMolecules(){
+  return getAllMolecules(AllMolecules());
+}
+
+int World::numMolecules(){
+  return molecules_deprecated->ListOfMolecules.size();
+}
+
+// system
+
+double * World::getDomain() {
+  return cell_size;
+}
+
+void World::setDomain(double * matrix)
+{
+
+}
+
+char * World::getDefaultName() {
+  return defaultName;
+}
+
+void World::setDefaultName(char * name)
+{
+  delete[](defaultName);
+  const int length = strlen(name);
+  defaultName = new char[length+2];
+  if (length < MAXSTRINGSIZE)
+    strncpy(defaultName, name, length);
+  else
+    strcpy(defaultName, "none");
+};
+
+
+/******************** Methods to change World state *********************/
+
+molecule* World::createMolecule(){
+  OBSERVE;
+  molecule *mol = NULL;
+  mol = NewMolecule();
+  assert(!molecules.count(currMoleculeId));
+  mol->setId(currMoleculeId++);
+  // store the molecule by ID
+  molecules[mol->getId()] = mol;
+  mol->signOn(this);
+  return mol;
+}
+
+void World::destroyMolecule(molecule* mol){
+  OBSERVE;
+  destroyMolecule(mol->getId());
+}
+
+void World::destroyMolecule(moleculeId_t id){
+  OBSERVE;
+  molecule *mol = molecules[id];
+  assert(mol);
+  DeleteMolecule(mol);
+  molecules.erase(id);
+}
+
+double *World::cell_size = NULL;
+char *World::defaultName = NULL;
+
+atom *World::createAtom(){
+  OBSERVE;
+  atomId_t id = getNextAtomId();
+  atom *res = NewAtom(id);
+  res->setWorld(this);
+  // store the atom by ID
+  atoms[res->getId()] = res;
+  return res;
+}
+
+
+int World::registerAtom(atom *atom){
+  OBSERVE;
+  atomId_t id = getNextAtomId();
+  atom->setId(id);
+  atom->setWorld(this);
+  atoms[atom->getId()] = atom;
+  return atom->getId();
+}
+
+void World::destroyAtom(atom* atom){
+  OBSERVE;
+  int id = atom->getId();
+  destroyAtom(id);
+}
+
+void World::destroyAtom(atomId_t id) {
+  OBSERVE;
+  atom *atom = atoms[id];
+  assert(atom);
+  DeleteAtom(atom);
+  atoms.erase(id);
+  releaseAtomId(id);
+}
+
+bool World::changeAtomId(atomId_t oldId, atomId_t newId, atom* target){
+  OBSERVE;
+  // in case this call did not originate from inside the atom, we redirect it,
+  // to also let it know that it has changed
+  if(!target){
+    target = atoms[oldId];
+    assert(target && "Atom with that ID not found");
+    return target->changeId(newId);
+  }
+  else{
+    if(reserveAtomId(newId)){
+      atoms.erase(oldId);
+      atoms.insert(pair<atomId_t,atom*>(newId,target));
+      return true;
+    }
+    else{
+      return false;
+    }
+  }
+}
+
+ManipulateAtomsProcess* World::manipulateAtoms(boost::function<void(atom*)> op,std::string name,AtomDescriptor descr){
+  return new ManipulateAtomsProcess(op, descr,name,true);
+}
+
+ManipulateAtomsProcess* World::manipulateAtoms(boost::function<void(atom*)> op,std::string name){
+  return manipulateAtoms(op,name,AllAtoms());
+}
+
+/********************* Internal Change methods for double Callback and Observer mechanism ********/
+
+void World::doManipulate(ManipulateAtomsProcess *proc){
+  proc->signOn(this);
+  {
+    OBSERVE;
+    proc->doManipulate(this);
+  }
+  proc->signOff(this);
+}
+/******************************* IDManagement *****************************/
+
+// Atoms
+
+atomId_t World::getNextAtomId(){
+  // see if we can reuse some Id
+  if(atomIdPool.empty()){
+    return currAtomId++;
+  }
+  else{
+    // we give out the first ID from the pool
+    atomId_t id = *(atomIdPool.begin());
+    atomIdPool.erase(id);
+    return id;
+  }
+}
+
+void World::releaseAtomId(atomId_t id){
+  atomIdPool.insert(id);
+  // defragmentation of the pool
+  set<atomId_t>::reverse_iterator iter;
+  // go through all Ids in the pool that lie immediately below the border
+  while(!atomIdPool.empty() && *(atomIdPool.rbegin())==(currAtomId-1)){
+    atomIdPool.erase(--currAtomId);
+  }
+}
+
+bool World::reserveAtomId(atomId_t id){
+  if(id>=currAtomId ){
+    // add all ids between the new one and current border as available
+    for(atomId_t pos=currAtomId; pos<id; ++pos){
+      atomIdPool.insert(pos);
+    }
+    currAtomId=id+1;
+    return true;
+  }
+  else if(atomIdPool.count(id)){
+    atomIdPool.erase(id);
+    return true;
+  }
+  else{
+    // this ID could not be reserved
+    return false;
+  }
+}
+
+// Molecules
+
+/******************************* Iterators ********************************/
+
+// Build the AtomIterator from template
+CONSTRUCT_SELECTIVE_ITERATOR(atom*,World::AtomSet,AtomDescriptor);
+
+
+World::AtomIterator World::getAtomIter(AtomDescriptor descr){
+  return AtomIterator(descr,atoms);
+}
+
+World::AtomIterator World::atomEnd(){
+  return AtomIterator(AllAtoms(),atoms,atoms.end());
+}
+
+// build the MoleculeIterator from template
+CONSTRUCT_SELECTIVE_ITERATOR(molecule*,World::MoleculeSet,MoleculeDescriptor);
+
+World::MoleculeIterator World::getMoleculeIter(MoleculeDescriptor descr){
+  return MoleculeIterator(descr,molecules);
+}
+
+World::MoleculeIterator World::moleculeEnd(){
+  return MoleculeIterator(AllMolecules(),molecules,molecules.end());
+}
+
+/******************************* Singleton Stuff **************************/
+
+World::World() :
+    periode(new periodentafel),
+    configuration(new config),
+    atoms(),
+    currAtomId(0),
+    molecules(),
+    currMoleculeId(0),
+    molecules_deprecated(new MoleculeListClass(this))
 {
   cell_size = new double[6];
-};
-
-/** Destructor of World.
- *
- */
+  cell_size[0] = 20.;
+  cell_size[1] = 0.;
+  cell_size[2] = 20.;
+  cell_size[3] = 0.;
+  cell_size[4] = 0.;
+  cell_size[5] = 20.;
+  defaultName = new char[MAXSTRINGSIZE];
+  strcpy(defaultName, "none");
+  molecules_deprecated->signOn(this);
+}
+
 World::~World()
 {
-  delete[](cell_size);
-};
-
-
-// TODO: Hide boost-thread using Autotools stuff when no threads are used
-World* World::theWorld = 0;
-
-
-World* World::get(){
-  // boost supports RAII-Style locking, so we don't need to unlock
-  if(!theWorld) {
-    theWorld = new World();
-  }
-  return theWorld;
-}
-
-void World::destroy(){
-  delete theWorld;
-  theWorld = 0;
-}
-
-World* World::reset(){
-  World* oldWorld = 0;
-  {
-    oldWorld = theWorld;
-    theWorld = new World();
-    // oldworld does not need protection any more,
-    // since we should have the only reference
-
-    // worldLock handles access to the pointer,
-    // not to the object
-  } // scope-end releases the lock
-
-  // we have to let all the observers know that the
-  // oldWorld was destroyed. oldWorld calls subjectKilled
-  // upon destruction. Every Observer getting that signal
-  // should see that it gets the updated new world
-  delete oldWorld;
-}
+  molecules_deprecated->signOff(this);
+  delete[] cell_size;
+  delete[] defaultName;
+  delete molecules_deprecated;
+  delete periode;
+  delete configuration;
+  MoleculeSet::iterator molIter;
+  for(molIter=molecules.begin();molIter!=molecules.end();++molIter){
+    DeleteMolecule((*molIter).second);
+  }
+  molecules.clear();
+  AtomSet::iterator atIter;
+  for(atIter=atoms.begin();atIter!=atoms.end();++atIter){
+    DeleteAtom((*atIter).second);
+  }
+  atoms.clear();
+}
+
+// Explicit instantiation of the singleton mechanism at this point
+
+CONSTRUCT_SINGLETON(World)
+
+/******************************* deprecated Legacy Stuff ***********************/
+
+MoleculeListClass *&World::getMolecules() {
+  return molecules_deprecated;
+}