Changeset 1315


Ignore:
Timestamp:
Jan 31, 2020 6:27:19 AM (2 months ago)
Author:
stefan
Message:

merge r1305,r1307,r1310 from branch autotools-update

Location:
stable/0.5
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • stable/0.5

  • stable/0.5/Couenne

  • stable/0.5/Couenne/src/cut/sdpcuts/CouenneMatrix.cpp

    r965 r1315  
    230230  int cnt=0;
    231231
    232   printf ("Vector (%ld) (", elem_ .  size ());
     232  printf ("Vector (%d) (", (int) elem_ .  size ());
    233233
    234234  for (std::set <CouenneScalar *, CouenneSparseVector::compare_scalars>::const_iterator i = elem_ . begin ();
     
    251251void CouenneExprMatrix::print () const {
    252252
    253   printf ("Matrix (%ld x %ld):\n",
    254           row_ . size (),
    255           col_ . size ());
     253  printf ("Matrix (%d x %d):\n",
     254          (int) row_ . size (),
     255          (int) col_ . size ());
    256256
    257257  // print rows
  • stable/0.5/Couenne/src/main

  • stable/0.5/Couenne/src/main/BonCouenne.cpp

    r1270 r1315  
    414414
    415415              if ((*it) -> Image ()) fprintf (txtSol, "%d %e\n", (*it) -> Index (), (*(*it) -> Image ()) ());
    416               else                   fprintf (txtSol, "%d %e\n", (*it) -> Index (), 0);
     416              else                   fprintf (txtSol, "%d %e\n", (*it) -> Index (), 0.0);
    417417
    418418            } else fprintf (txtSol, "%d %e\n", (*it) -> Index (), (*(*it)) ());
  • stable/0.5/Couenne/src/readnl/CouenneAmplInterface.cpp

    r1147 r1315  
    5252
    5353// get ASL op. code relative to function pointer passed as parameter
    54 int getOperator (efunc *);
     54size_t getOperator (efunc *);
    5555
    5656#define OBJ_DE    ((const ASL_fg *) asl) -> I.obj_de_
  • stable/0.5/Couenne/src/standardize/analyzeSparsity.cpp

    r732 r1315  
    6060  if (jnlst_ -> ProduceOutput (Ipopt::J_ALL, J_REFORMULATE)) {
    6161    printf ("qmap has %d element, occur has %d, md*s*(s+1)/2 = %g\n",
    62             qmap.Map().size (),
    63             occur.size (),
     62            (int)qmap.Map().size (),
     63            (int)occur.size (),
    6464            MIN_DENSITY * (double) (occur.size ()) * ((double) (occur.size ()) + 1.) / 2);
    6565  }
  • stable/0.5/Couenne/src/standardize/auxiliarize.cpp

    r792 r1315  
    7474
    7575      if (jnlst_ -> ProduceOutput (Ipopt::J_ALL, J_REFORMULATE)) {
    76         printf ("replacing within common expression [%d]: ", i - commonexprs_.begin ()); fflush (stdout); (*i) -> print (); printf ("\n");
     76        printf ("replacing within common expression [%d]: ", (int)(i - commonexprs_.begin ())); fflush (stdout); (*i) -> print (); printf ("\n");
    7777      }
    7878
     
    124124
    125125      if (jnlst_ -> ProduceOutput (Ipopt::J_ALL, J_REFORMULATE)) {
    126         printf ("replacing within constraint [%d]: ", i - constraints_.begin ()); fflush (stdout); (*i) -> print ();
     126        printf ("replacing within constraint [%d]: ", (int)(i - constraints_.begin ())); fflush (stdout); (*i) -> print ();
    127127      }
    128128
Note: See TracChangeset for help on using the changeset viewer.