ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-4/src/brains/SimSetup.cpp
(Generate patch)

Comparing trunk/OOPSE-4/src/brains/SimSetup.cpp (file contents):
Revision 1614 by gezelter, Wed Oct 20 04:55:21 2004 UTC vs.
Revision 1625 by tim, Thu Oct 21 16:22:01 2004 UTC

# Line 1791 | Line 1791 | void SimSetup::setupZConstraint(SimInfo& theInfo){
1791  
1792    if (globals->haveZconstraintTime()){
1793      //add sample time of z-constraint  into SimInfo's property list                    
1794 <    DoubleData* zconsTimeProp = new DoubleData();
1794 >    DoubleGenericData* zconsTimeProp = new DoubleGenericData();
1795      zconsTimeProp->setID(ZCONSTIME_ID);
1796      zconsTimeProp->setData(globals->getZconsTime());
1797      theInfo.addProperty(zconsTimeProp);
# Line 1806 | Line 1806 | void SimSetup::setupZConstraint(SimInfo& theInfo){
1806  
1807    //push zconsTol into siminfo, if user does not specify
1808    //value for zconsTol, a default value will be used
1809 <  DoubleData* zconsTol = new DoubleData();
1809 >  DoubleGenericData* zconsTol = new DoubleGenericData();
1810    zconsTol->setID(ZCONSTOL_ID);
1811    if (globals->haveZconsTol()){
1812      zconsTol->setData(globals->getZconsTol());
# Line 1826 | Line 1826 | void SimSetup::setupZConstraint(SimInfo& theInfo){
1826    theInfo.addProperty(zconsTol);
1827  
1828    //set Force Subtraction Policy
1829 <  StringData* zconsForcePolicy = new StringData();
1829 >  StringGenericData* zconsForcePolicy = new StringGenericData();
1830    zconsForcePolicy->setID(ZCONSFORCEPOLICY_ID);
1831  
1832    if (globals->haveZconsForcePolicy()){
# Line 1845 | Line 1845 | void SimSetup::setupZConstraint(SimInfo& theInfo){
1845    theInfo.addProperty(zconsForcePolicy);
1846  
1847    //set zcons gap
1848 <  DoubleData* zconsGap = new DoubleData();
1848 >  DoubleGenericData* zconsGap = new DoubleGenericData();
1849    zconsGap->setID(ZCONSGAP_ID);
1850  
1851    if (globals->haveZConsGap()){
# Line 1854 | Line 1854 | void SimSetup::setupZConstraint(SimInfo& theInfo){
1854    }
1855  
1856    //set zcons fixtime
1857 <  DoubleData* zconsFixtime = new DoubleData();
1857 >  DoubleGenericData* zconsFixtime = new DoubleGenericData();
1858    zconsFixtime->setID(ZCONSFIXTIME_ID);
1859  
1860    if (globals->haveZConsFixTime()){
# Line 1863 | Line 1863 | void SimSetup::setupZConstraint(SimInfo& theInfo){
1863    }
1864  
1865    //set zconsUsingSMD
1866 <  IntData* zconsUsingSMD = new IntData();
1866 >  IntGenericData* zconsUsingSMD = new IntGenericData();
1867    zconsUsingSMD->setID(ZCONSUSINGSMD_ID);
1868  
1869    if (globals->haveZConsUsingSMD()){
# Line 1879 | Line 1879 | void SimSetup::setupZConstraint(SimInfo& theInfo){
1879  
1880    zconsOutput = zconsOutput.substr(0, zconsOutput.rfind(".")) + ".fz";
1881  
1882 <  StringData* zconsFilename = new StringData();
1882 >  StringGenericData* zconsFilename = new StringGenericData();
1883    zconsFilename->setID(ZCONSFILENAME_ID);
1884    zconsFilename->setData(zconsOutput);
1885  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines