Changeset 50


Ignore:
Timestamp:
May 30, 2010 3:46:31 PM (10 years ago)
Author:
nsawhney
Message:

Fix for OBOE-ticket #11, numSubProblems to be initialized to 1

Location:
stable/1.0
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • stable/1.0/src/Benchmark/MCF/param.txt

    r6 r50  
    1 NumSubProblems Int 1
     1#NumSubProblems Int 1
    22NumVariables Int 150
    33ProblemName S "MCFTest"
  • stable/1.0/src/ProblemInput/Parameters.C

    r1 r50  
    3333  _type = OPT_MIN;
    3434  _numVariables = 0;
    35   _numSubProblems = 1;
     35  _pi = 0;
     36  setNumSubProblems(1);
    3637 
    3738  _objLB = ACCPM_MINUS_INF;
     
    4243   _varUB = 0;
    4344   _b = 0;
    44    _pi = 0;
    4545   _delta = 5;
    4646   _eta = 0.99;
     
    201201}
    202202
     203Parameters::Parameters()
     204{
     205  init();
     206}
     207
    203208Parameters::Parameters(const char *fileName)
    204209{
  • stable/1.0/src/ProblemInput/Parameters.h

    r1 r50  
    234234  public:
    235235 
     236    Parameters();
    236237    Parameters(const char *fileName);
    237238    virtual ~Parameters();
Note: See TracChangeset for help on using the changeset viewer.