Skip to content

Commit

Permalink
Use dev lpSolve
Browse files Browse the repository at this point in the history
Closes #682.
  • Loading branch information
gaborcsardi committed Sep 5, 2024
1 parent 64a34ee commit 150839c
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 10 deletions.
1 change: 1 addition & 0 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ Config/needs/dependencies:
curl,
filelock,
jsonlite,
gaborcsardi/lpSolve,
pkgbuild,
r-lib/pkgcache,
r-lib/pkgdepends,
Expand Down
6 changes: 2 additions & 4 deletions src/library/lpSolve/DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: lpSolve
Version: 5.6.20
Version: 5.6.20.9000
Title: Interface to 'Lp_solve' v. 5.5 to Solve Linear/Integer Programs
Author: Michel Berkelaar and others
Maintainer: Gábor Csárdi <[email protected]>
Expand All @@ -14,6 +14,4 @@ URL: https://github.com/gaborcsardi/lpSolve
BugReports: https://github.com/gaborcsardi/lpSolve/issues
Encoding: UTF-8
NeedsCompilation: yes
Packaged: 2023-12-10 12:59:14 UTC; gaborcsardi
Repository: CRAN
Date/Publication: 2023-12-10 13:40:02 UTC
Packaged: 2024-09-05 07:46:18 UTC; gaborcsardi
6 changes: 1 addition & 5 deletions src/library/lpSolve/src/commonlib.c
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@

#include <sys/types.h>

#ifdef INTEGERTIME
# include <time.h>
#else
# include <sys/timeb.h>
#endif
#include <time.h>

#include <stdlib.h>
#include <stdio.h>
Expand Down
1 change: 0 additions & 1 deletion src/library/lpSolve/src/lp_utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include "lp_lib.h"
#include "lp_utils.h"
#include <time.h>
#include <sys/timeb.h>

#ifdef FORTIFY
# include "lp_fortify.h"
Expand Down

0 comments on commit 150839c

Please sign in to comment.