Changeset 2018 for stable/1.15/Clp


Ignore:
Timestamp:
Jan 31, 2014 12:17:03 AM (5 years ago)
Author:
stefan
Message:

revert previous commit (r2017): wrong branch

Location:
stable/1.15/Clp/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/1.15/Clp/src/Clp_C_Interface.cpp

    r2017 r2018  
    669669     return array;
    670670}
    671 COINLIBAPI void COINLINKAGE
    672 Clp_freeRay(Clp_Simplex * model, double * ray)
    673 {
    674      free(ray);
    675 }
    676671/* See if status array exists (partly for OsiClp) */
    677672COINLIBAPI int COINLINKAGE
  • stable/1.15/Clp/src/Clp_C_Interface.h

    r2017 r2018  
    213213     /** Integer information */
    214214     COINLIBAPI char * COINLINKAGE Clp_integerInformation(Clp_Simplex * model);
    215      /** Gives Infeasibility ray.
    216       *
    217       * Use Clp_freeRay to free the returned array.
    218       *
    219       * @return infeasibility ray, or NULL returned if none/wrong.
    220       */
     215     /** Infeasibility/unbounded ray (NULL returned if none/wrong)
     216         Up to user to use free() on these arrays.  */
    221217     COINLIBAPI double * COINLINKAGE Clp_infeasibilityRay(Clp_Simplex * model);
    222      /** Gives ray in which the problem is unbounded.
    223       *
    224       * Use Clp_freeRay to free the returned array.
    225       *
    226       * @return unbounded ray, or NULL returned if none/wrong.
    227       */
    228218     COINLIBAPI double * COINLINKAGE Clp_unboundedRay(Clp_Simplex * model);
    229      /** Frees a infeasibility or unbounded ray. */
    230      COINLIBAPI void COINLINKAGE Clp_freeRay(Clp_Simplex * model, double * ray);
    231219     /** See if status array exists (partly for OsiClp) */
    232220     COINLIBAPI int COINLINKAGE Clp_statusExists(Clp_Simplex * model);
Note: See TracChangeset for help on using the changeset viewer.