Changeset 155


Ignore:
Timestamp:
Nov 22, 2007 12:56:06 PM (14 years ago)
Author:
kingaj
Message:

Fix of bug in SmiSmpsIO.cpp -- triggered by column names with two characters. argh.
Also now provide default argument to readSmps for the combine rule.

Location:
stable/0.8/Smi/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/0.8/Smi/src/SmiScnModel.hpp

    r153 r155  
    4242        SmiScnModel smi;
    4343        smi.readSmps("app0110R");
    44         smi.setOsiSolverHandle(OsiClpSolverInterface());
     44        smi.setOsiSolverHandle(new OsiClpSolverInterface());
    4545        OsiSolverInterface *osiStoch = smi.loadOsiSolverData();
    4646        osiStoch->initialSolve();
     
    6969        */
    7070        int readSmps(const char *name,
    71                                  SmiCoreCombineRule *r=NULL );
     71                SmiCoreCombineRule *r=SmiCoreCombineReplace::Instance() );
    7272
    7373        //SmiCoreData * getCore() {return core_;}
  • stable/0.8/Smi/src/SmiSmpsIO.cpp

    r111 r155  
    606606                                          }
    607607                                  }
     608                                  if (i==SMI_UNKNOWN_MPS_TYPE)
     609                                          i = SMI_COLUMN_CARD;
    608610                          }
    609611                          else
     
    648650                                  position_=eol_;
    649651                                  break;
     652                          case SMI_UNKNOWN_MPS_TYPE:
     653                                  //this in case the column name has two characters!
    650654                          case SMI_COLUMN_CARD:
    651655
Note: See TracChangeset for help on using the changeset viewer.