Changes in src/builder.cpp [d56640:aac3ef]

File:

• src/builder.cpp (modified) (15 diffs)

src/builder.cpp

@@ -74 +74 @@
 #include "Menu/ActionMenuItem.hpp"
 #include "Actions/ActionRegistry.hpp"
-#include "Actions/ActionHistory.hpp"
 #include "Actions/MethodAction.hpp"
 #include "Actions/small_actions.hpp"
@@ -1433 +1432 @@
      }
      if (mol == NULL) {
-       mol = World::getInstance().createMolecule();
+       mol = new molecule(periode);
        mol->ActiveFlag = true;
        if (ConfigFileName != NULL)
@@ -1482 +1481 @@
                 SaveFlag = true;
                 Log() << Verbose(1) << "Adding new atom with element " << argv[argptr] << " at (" << argv[argptr+1] << "," << argv[argptr+2] << "," << argv[argptr+3] << "), ";
-                first = World::getInstance().createAtom();
+                first = new atom;
                 first->type = periode->FindElement(atoi(argv[argptr]));
                 if (first->type != NULL)
@@ -1594 +1593 @@
                 }
                 LCList = new LinkedCell(Boundary, 2.*radius);
-                const element *elemental = periode->FindElement((atomicNumber_t) atoi(argv[argptr]));
+                element *elemental = periode->FindElement((const int) atoi(argv[argptr]));
                 FindNonConvexBorder(Boundary, TesselStruct, LCList, radius, NULL);
                 int ranges[NDIM] = {1,1,1};
@@ -1635 +1634 @@
                 Log() << Verbose(1) << "Filling Box with water molecules." << endl;
                 // construct water molecule
-                molecule *filler = World::getInstance().createMolecule();
+                molecule *filler = new molecule(periode);
                 molecule *Filling = NULL;
                 atom *second = NULL, *third = NULL;
@@ -1642 +1641 @@
 //                first->x.Zero();
 //                filler->AddAtom(first);
-                first = World::getInstance().createAtom();
+                first = new atom();
                 first->type = periode->FindElement(1);
                 first->x.Init(0.441, -0.143, 0.);
                 filler->AddAtom(first);
-                second = World::getInstance().createAtom();
+                second = new atom();
                 second->type = periode->FindElement(1);
                 second->x.Init(-0.464, 1.137, 0.0);
                 filler->AddAtom(second);
-                third = World::getInstance().createAtom();
+                third = new atom();
                 third->type = periode->FindElement(8);
                 third->x.Init(-0.464, 0.177, 0.);
@@ -1665 +1664 @@
                   molecules->insert(Filling);
                 }
-                World::getInstance().destroyMolecule(filler);
+                delete(filler);
                 argptr+=6;
               }
@@ -2071 +2070 @@
                   int faktor = atoi(argv[argptr++]);
                   int count;
-                  const element ** Elements;
+                  element ** Elements;
                   Vector ** vectors;
                   if (faktor < 1) {
-                    eLog() << Verbose(1) << "Repetition factor must be greater than 1!" << endl;
+                    eLog() << Verbose(1) << "Repetition factor mus be greater than 1!" << endl;
                     faktor = 1;
                   }
@@ -2080 +2079 @@
                   if (mol->AtomCount != 0) {  // if there is more than none
                     count = mol->AtomCount;   // is changed becausing of adding, thus has to be stored away beforehand
-                    Elements = new const element *[count];
+                    Elements = new element *[count];
                     vectors = new Vector *[count];
                     j = 0;
@@ -2098 +2097 @@
                       x.AddVector(&y); // per factor one cell width further
                       for (int k=count;k--;) { // go through every atom of the original cell
-                        first = World::getInstance().createAtom(); // create a new body
+                        first = new atom(); // create a new body
                         first->x.CopyVector(vectors[k]);  // use coordinate of original atom
                         first->x.AddVector(&x);      // translate the coordinates
@@ -2169 +2168 @@
 void cleanUp(config *configuration){
   UIFactory::purgeInstance();
-  World::purgeInstance();
+  World::destroy();
   delete(configuration);
   Log() << Verbose(0) <<  "Maximum of allocated memory: "
@@ -2178 +2177 @@
   logger::purgeInstance();
   errorLogger::purgeInstance();
-  ActionRegistry::purgeInstance();
+  ActionRegistry::purgeRegistry();
 }
 
@@ -2191 +2190 @@
     char *ConfigFileName = NULL;
     int j;
-
     setVerbosity(0);
-    // need to init the history before any action is created
-    ActionHistory::init();
     /* structure of ParseCommandLineOptions will be refactored later */
-    j = ParseCommandLineOptions(argc, argv,  World::getInstance().getMolecules(), World::getInstance().getPeriode(), *configuration, ConfigFileName);
+    j = ParseCommandLineOptions(argc, argv,  World::get()->getMolecules(), World::get()->getPeriode(), *configuration, ConfigFileName);
     switch (j){
         case 255:
@@ -2206 +2202 @@
             break;
     }
-    if(World::getInstance().numMolecules() == 0){
-        mol = World::getInstance().createMolecule();
-        World::getInstance().getMolecules()->insert(mol);
-        cout << "Molecule created" << endl;
+    if(World::get()->numMolecules() == 0){
+        mol = World::get()->createMolecule();
         if(mol->cell_size[0] == 0.){
             Log() << Verbose(0) << "enter lower tridiagonal form of basis matrix" << endl << endl;
@@ -2229 +2223 @@
 
       UIFactory::makeUserInterface(UIFactory::Text);
-      MainWindow *mainWindow = UIFactory::getInstance().makeMainWindow(populaters,World::getInstance().getMolecules(), configuration, World::getInstance().getPeriode(), ConfigFileName);
+      MainWindow *mainWindow = UIFactory::get()->makeMainWindow(populaters,World::get()->getMolecules(), configuration, World::get()->getPeriode(), ConfigFileName);
       mainWindow->display();
       delete mainWindow;
     }
 
-    if(World::getInstance().getPeriode()->StorePeriodentafel(configuration->databasepath))
+    if(World::get()->getPeriode()->StorePeriodentafel(configuration->databasepath))
         Log() << Verbose(0) << "Saving of elements.db successful." << endl;