Changeset 82


Ignore:
Timestamp:
Mar 24, 2009 11:54:36 PM (11 years ago)
Author:
pbelotti
Message:

giving Couenne its own name...

Location:
trunk/Couenne/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Couenne/src/main/BonCouenneInterface.cpp

    r70 r82  
    4242                                 Ipopt::SmartPtr<Ipopt::OptionsList> options,
    4343                                 Ipopt::SmartPtr<Ipopt::Journalist> journalist){
     44  //  if (!IsValid (app_))
     45  //createApplication (roptions, options, journalist, "couenne.");
    4446  AmplInterface::readAmplNlFile(argv, roptions, options, journalist);
    4547}
  • trunk/Couenne/src/main/BonCouenneInterface.hpp

    r70 r82  
    1 // (C) Copyright International Business Machines Corporation (IBM) 2006, 2007
     1// (C) Copyright International Business Machines Corporation (IBM) 2006-09
    22// All Rights Reserved.
    33// This code is published under the Common Public License.
     
    3939  virtual ~CouenneInterface();
    4040
     41  //
     42  virtual std::string  appName() {return "couenne";}
     43
    4144#ifdef COIN_HAS_ASL   
    4245  /** read ampl file using inputed options, journalist....*/
  • trunk/Couenne/src/readnl/invmap.cpp

    r80 r82  
    11/*
    2  * Name: invmap.cpp
    3  * Author: Pietro Belotti
     2 * Name:    invmap.cpp
     3 * Author:  Pietro Belotti
    44 * Purpose: create a bijection between ASL's efunc and integer to
    55 *          inversely map e->op fields into constant operators
    66 *
    7  * (C) Carnegie-Mellon University, 2006.
     7 * (C) Carnegie-Mellon University, 2006-09.
    88 * This file is licensed under the Common Public License (CPL)
    99 */
     
    1515#include "nlp.h"
    1616#include "r_opn.hd"
    17 
    18 //#define Intcast (int)(long)
    1917
    2018/* couples an ASL function pointer with the relative operator constant */
  • trunk/Couenne/src/readnl/nl2e.cpp

    r80 r82  
    138138
    139139  default:
    140     printf ("ERROR: unknown operator (address %p), aborting.\n", Intcast (e -> op)); 
     140    printf ("ERROR: unknown operator (address %p), aborting.\n", Intcast (e -> op));
    141141    exit (-1);
    142142    //return new exprConst (0);
Note: See TracChangeset for help on using the changeset viewer.