Last change
on this file since 6250e5 was f87c2a, checked in by Frederik Heber <heber@…>, 15 years ago |
BUGFIX: DefaultName of molecule was too small an array.
- We saw wrong molecule names such as "none@4", this is fixed.
Signed-off-by: Frederik Heber <heber@…>
|
-
Property mode
set to
100644
|
File size:
1.3 KB
|
Line | |
---|
1 | /*
|
---|
2 | * world.cpp
|
---|
3 | *
|
---|
4 | * Created on: Mar 3, 2010
|
---|
5 | * Author: heber
|
---|
6 | */
|
---|
7 |
|
---|
8 | #include <string>
|
---|
9 |
|
---|
10 | #include "defs.hpp"
|
---|
11 | #include "World.hpp"
|
---|
12 |
|
---|
13 | double *World::cell_size = 0;
|
---|
14 | char *World::DefaultName = 0;
|
---|
15 |
|
---|
16 | /** Constructor of World.
|
---|
17 | *
|
---|
18 | */
|
---|
19 | World::World()
|
---|
20 | {
|
---|
21 | cell_size = new double[6];
|
---|
22 | DefaultName = new char[MAXSTRINGSIZE];
|
---|
23 | strcpy(DefaultName, "none");
|
---|
24 | };
|
---|
25 |
|
---|
26 | /** Destructor of World.
|
---|
27 | *
|
---|
28 | */
|
---|
29 | World::~World()
|
---|
30 | {
|
---|
31 | delete[](cell_size);
|
---|
32 | delete[](DefaultName);
|
---|
33 | };
|
---|
34 |
|
---|
35 |
|
---|
36 | // TODO: Hide boost-thread using Autotools stuff when no threads are used
|
---|
37 | World* World::theWorld = 0;
|
---|
38 |
|
---|
39 |
|
---|
40 | World* World::get(){
|
---|
41 | // boost supports RAII-Style locking, so we don't need to unlock
|
---|
42 | if(!theWorld) {
|
---|
43 | theWorld = new World();
|
---|
44 | }
|
---|
45 | return theWorld;
|
---|
46 | }
|
---|
47 |
|
---|
48 | void World::destroy(){
|
---|
49 | delete theWorld;
|
---|
50 | theWorld = 0;
|
---|
51 | }
|
---|
52 |
|
---|
53 | World* World::reset(){
|
---|
54 | World* oldWorld = 0;
|
---|
55 | {
|
---|
56 | oldWorld = theWorld;
|
---|
57 | theWorld = new World();
|
---|
58 | // oldworld does not need protection any more,
|
---|
59 | // since we should have the only reference
|
---|
60 |
|
---|
61 | // worldLock handles access to the pointer,
|
---|
62 | // not to the object
|
---|
63 | } // scope-end releases the lock
|
---|
64 |
|
---|
65 | // we have to let all the observers know that the
|
---|
66 | // oldWorld was destroyed. oldWorld calls subjectKilled
|
---|
67 | // upon destruction. Every Observer getting that signal
|
---|
68 | // should see that it gets the updated new world
|
---|
69 | delete oldWorld;
|
---|
70 | }
|
---|
Note:
See
TracBrowser
for help on using the repository browser.