--- trunk/OOPSE/libmdtools/SimInfo.cpp	2003/07/16 21:30:56	626
+++ trunk/OOPSE/libmdtools/SimInfo.cpp	2003/07/31 15:35:07	658
@@ -33,6 +33,7 @@ SimInfo::SimInfo(){
   the_integrator = NULL;
   setTemp = 0;
   thermalTime = 0.0;
+  currentTime = 0.0;
   rCut = 0.0;
   ecr = 0.0;
   est = 0.0;
@@ -527,4 +528,53 @@ void SimInfo::checkCutOffs( void ){
 
   oldEcr = ecr;
   oldRcut = rCut;
+}
+
+void SimInfo::addProperty(GenericData* prop){
+
+  map<string, GenericData*>::iterator result;
+  result = properties.find(prop->getID());
+  
+  //we can't simply use  properties[prop->getID()] = prop,
+  //it will cause memory leak if we already contain a propery which has the same name of prop
+  
+  if(result != properties.end()){
+    
+    delete (*result).second;
+    (*result).second = prop;
+      
+  }
+  else{
+
+    properties[prop->getID()] = prop;
+
+  }
+    
+}
+
+GenericData* SimInfo::getProperty(const string& propName){
+ 
+  map<string, GenericData*>::iterator result;
+  
+  //string lowerCaseName = ();
+  
+  result = properties.find(propName);
+  
+  if(result != properties.end()) 
+    return (*result).second;  
+  else   
+    return NULL;  
 }
+
+vector<GenericData*> SimInfo::getProperties(){
+
+  vector<GenericData*> result;
+  map<string, GenericData*>::iterator i;
+  
+  for(i = properties.begin(); i != properties.end(); i++)
+    result.push_back((*i).second);
+    
+  return result;
+}
+
+