ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libBASS/Globals.hpp
(Generate patch)

Comparing trunk/OOPSE/libBASS/Globals.hpp (file contents):
Revision 1031 by tim, Fri Feb 6 18:58:06 2004 UTC vs.
Revision 1091 by tim, Tue Mar 16 19:22:56 2004 UTC

# Line 70 | Line 70 | class Globals{ (public)
70    double getZconsTime(void)         { return zcons_time;}
71    double getZconsTol(void)          { return zcons_tol;}
72    char*  getZconsForcePolicy(void)  { return zconsForcePolicy;}
73 +  double getZconsGap(void) {return zcons_gap;}
74 +  double getZconsFixtime(void) {return zcons_fixtime;}
75 +  
76    int    getSeed(void)              { return seed;}
77    double getLJrcut(void)            { return LJrcut;}
78  
79    char* getMinimizer(void) { return minimizer_name;}
80    int getMinMaxIter(void) {return minimizer_maxiteration;}
81    int getMinWriteFrq(void) {return minimizer_writefrq;}
82 <  int getMinResetFrq(void) {return minimizer_resetfrq;}
82 >  double getMinStepSize(void) {return minimizer_stepsize;}
83    double getMinFTol(void) {return minimizer_ftol;}
84    double getMinGTol(void) {return minimizer_gtol;}
85    double getMinLSTol(void) {return minimizer_ls_tol;}
# Line 107 | Line 110 | class Globals{ (public)
110    short int haveZconstraints( void )  { return have_zConstraints;}
111    short int haveZconsTol(void)        { return have_zcons_tol;}
112    short int haveZconsForcePolicy(void){ return have_zcons_force_policy;}
113 +  short int haveZConsGap(void) {return have_zcons_gap;}
114 +  short int haveZConsFixTime(void) {return have_zcons_fixtime;}
115 +  
116    short int haveSeed(void)            { return have_seed;}
117    short int haveLJrcut(void)          { return have_ljrcut;}
118    short int haveMinimizer(void) { return have_minimizer;}
119    short int haveMinMaxIter(void) {return have_minimizer_maxiteration;}
120    short int haveMinWriteFrq(void) {return have_minimizer_writefrq;}
121 <  short int haveMinResetFrq(void) {return have_minimizer_resetfrq;}
121 >  short int haveMinStepSize(void) {return have_minimizer_stepsize;}
122    short int haveMinFTol(void) {return have_minimizer_ftol;}
123    short int haveMinGTol(void) {return have_minimizer_gtol;}
124    short int haveMinLSTol(void) {return have_minimizer_ls_tol;}
# Line 171 | Line 177 | class Globals{ (public)
177    double zcons_time;    
178    double zcons_tol;
179    char zconsForcePolicy[100];
180 +  double zcons_gap;
181 +  double zcons_fixtime;
182 +  
183    int seed;
184    double LJrcut;
185    char minimizer_name[100];
186    int minimizer_maxiteration;
187    int minimizer_writefrq;
188 <  int minimizer_resetfrq;
188 >  double minimizer_stepsize;
189    double minimizer_ftol;
190    double minimizer_gtol;
191    double minimizer_ls_tol;
# Line 194 | Line 203 | class Globals{ (public)
203    short int have_zcons_time, have_zConstraints, have_n_zConstraints;
204    short int have_zcons_tol, have_seed, have_ljrcut;  
205    short int have_zcons_force_policy, have_reset_time;
206 +  short int have_zcons_gap, have_zcons_fixtime;
207    short int have_minimizer, have_minimizer_maxiteration;
208 <  short int have_minimizer_writefrq, have_minimizer_resetfrq;
208 >  short int have_minimizer_writefrq, have_minimizer_stepsize;
209    short int have_minimizer_ftol, have_minimizer_gtol;
210    short int have_minimizer_ls_tol, have_minimizer_ls_maxiteration;
211   };

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines