Ignore:
Timestamp:
Mar 10, 2010, 5:51:48 PM (16 years ago)
Author:
Tillmann Crueger <crueger@…>
Children:
4fc41a
Parents:
025ca2
Message:

Added generic singleton Pattern that can be inherited to any class making that class a singleton.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • molecuilder/src/unittests/AnalysisCorrelationToSurfaceUnitTest.cpp

    r025ca2 r4c60ef  
    6161
    6262  // construct periodentafel
    63   tafel = World::get()->getPeriode();
     63  tafel = World::getInstance().getPeriode();
    6464  tafel->AddElement(hydrogen);
    6565  tafel->AddElement(carbon);
    6666
    6767  // construct molecule (tetraeder of hydrogens) base
    68   TestMolecule = World::get()->createMolecule();
    69   Walker = World::get()->createAtom();
     68  TestMolecule = World::getInstance().createMolecule();
     69  Walker = World::getInstance().createAtom();
    7070  Walker->type = hydrogen;
    7171  Walker->node->Init(1., 0., 1. );
    7272  TestMolecule->AddAtom(Walker);
    73   Walker = World::get()->createAtom();
     73  Walker = World::getInstance().createAtom();
    7474  Walker->type = hydrogen;
    7575  Walker->node->Init(0., 1., 1. );
    7676  TestMolecule->AddAtom(Walker);
    77   Walker = World::get()->createAtom();
     77  Walker = World::getInstance().createAtom();
    7878  Walker->type = hydrogen;
    7979  Walker->node->Init(1., 1., 0. );
    8080  TestMolecule->AddAtom(Walker);
    81   Walker = World::get()->createAtom();
     81  Walker = World::getInstance().createAtom();
    8282  Walker->type = hydrogen;
    8383  Walker->node->Init(0., 0., 0. );
    … …  
    8787  CPPUNIT_ASSERT_EQUAL( TestMolecule->AtomCount, 4 );
    8888
    89   TestList = World::get()->getMolecules();
     89  TestList = World::getInstance().getMolecules();
    9090  TestMolecule->ActiveFlag = true;
    9191  TestList->insert(TestMolecule);
    … …  
    100100
    101101  // add outer atoms
    102   Walker = World::get()->createAtom();
     102  Walker = World::getInstance().createAtom();
    103103  Walker->type = carbon;
    104104  Walker->node->Init(4., 0., 4. );
    105105  TestMolecule->AddAtom(Walker);
    106   Walker = World::get()->createAtom();
     106  Walker = World::getInstance().createAtom();
    107107  Walker->type = carbon;
    108108  Walker->node->Init(0., 4., 4. );
    109109  TestMolecule->AddAtom(Walker);
    110   Walker = World::get()->createAtom();
     110  Walker = World::getInstance().createAtom();
    111111  Walker->type = carbon;
    112112  Walker->node->Init(4., 4., 0. );
    113113  TestMolecule->AddAtom(Walker);
    114114  // add inner atoms
    115   Walker = World::get()->createAtom();
     115  Walker = World::getInstance().createAtom();
    116116  Walker->type = carbon;
    117117  Walker->node->Init(0.5, 0.5, 0.5 );
    … …  
    135135  // note that all the atoms are cleaned by TestMolecule
    136136  delete(LC);
    137   World::destroy();
     137  World::purgeInstance();
    138138  MemoryUsageObserver::purgeInstance();
    139139  logger::purgeInstance();
Note: See TracChangeset for help on using the changeset viewer.