pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
add mccs
Module Name: pkgsrc-wip
Committed By: Vincent Bernardoff <vb%luminar.eu.org@localhost>
Pushed By: vbmithr
Date: Wed Mar 18 21:52:11 2020 +0100
Changeset: c5ffa4b9d061b8151f618d448bbb32b1f297511a
Added Files:
mccs/DESCR
mccs/Makefile
mccs/PLIST
mccs/distinfo
mccs/options.mk
mccs/patches/patch-make.local
mccs/patches/patch-sources_leximax__combiner.c
mccs/patches/patch-sources_leximin__combiner.c
mccs/patches/patch-sources_lexleximax__combiner.c
mccs/patches/patch-sources_lexleximin__combiner.c
Log Message:
add mccs
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c5ffa4b9d061b8151f618d448bbb32b1f297511a
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
mccs/DESCR | 12 +++++++++
mccs/Makefile | 25 ++++++++++++++++++
mccs/PLIST | 2 ++
mccs/distinfo | 11 ++++++++
mccs/options.mk | 19 ++++++++++++++
mccs/patches/patch-make.local | 30 ++++++++++++++++++++++
mccs/patches/patch-sources_leximax__combiner.c | 31 +++++++++++++++++++++++
mccs/patches/patch-sources_leximin__combiner.c | 31 +++++++++++++++++++++++
mccs/patches/patch-sources_lexleximax__combiner.c | 22 ++++++++++++++++
mccs/patches/patch-sources_lexleximin__combiner.c | 22 ++++++++++++++++
10 files changed, 205 insertions(+)
diffs:
diff --git a/mccs/DESCR b/mccs/DESCR
new file mode 100644
index 0000000000..b513475a95
--- /dev/null
+++ b/mccs/DESCR
@@ -0,0 +1,12 @@
+mccs (which stands for Multi Criteria CUDF Solver) provides a mean to
+solve cudf problems as defined in the MANCOOSI european project
+(http://www.mancoosi.org) and was partially supported by the European
+Community's 7th Framework Programme (FP7/2007-2013), MANCOOSI project,
+grant agreement n. 214898.
+
+mccs has been developed under linux and has not been tested on other
+platforms. The provided mccs is statically linked and run under linux
+32 bits.
+
+mccs translate the cudf problem into an integer linear program which
+is then solved by an underlying solver.
\ No newline at end of file
diff --git a/mccs/Makefile b/mccs/Makefile
new file mode 100644
index 0000000000..d85bd9244c
--- /dev/null
+++ b/mccs/Makefile
@@ -0,0 +1,25 @@
+# $NetBSD$
+
+DISTNAME= mccs-1.1-srcs
+PKGNAME= mccs-1.1
+CATEGORIES= misc
+MASTER_SITES= http://www.i3s.unice.fr/~cpjm/misc/
+EXTRACT_SUFX= .tgz
+
+MAINTAINER= vb%luminar.eu.org@localhost
+HOMEPAGE= http://www.i3s.unice.fr/~cpjm/misc/
+COMMENT= Multi Criteria CUDF Solver
+LICENSE= modified-bsd
+
+MAKE_FILE= makefile
+USE_TOOLS+= gmake
+BUILD_TARGET= mccs
+USE_LANGUAGES= c c++
+WRKSRC= ${WRKDIR}/mccs-1.1
+INSTALLATION_DIRS+=bin
+
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/mccs ${DESTDIR}${PREFIX}/bin/mccs
+
+.include "options.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/mccs/PLIST b/mccs/PLIST
new file mode 100644
index 0000000000..a87066b489
--- /dev/null
+++ b/mccs/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD$
+bin/mccs
diff --git a/mccs/distinfo b/mccs/distinfo
new file mode 100644
index 0000000000..2e160a6c7f
--- /dev/null
+++ b/mccs/distinfo
@@ -0,0 +1,11 @@
+$NetBSD$
+
+SHA1 (mccs-1.1-srcs.tgz) = 1d421690ccdc79feb0d8f1776300ac7fbbc9ca10
+RMD160 (mccs-1.1-srcs.tgz) = e6ee8542c021aced01f82a8992622eba39fc6766
+SHA512 (mccs-1.1-srcs.tgz) = 95cd0af58115202dc1bb8deaae28b25662e06cbbcb195c608a01083d4c602bcc1ede213dbc4e8ece7b9ab4afc9ef419fa57c284602dc0c908595e77710281de4
+Size (mccs-1.1-srcs.tgz) = 65553 bytes
+SHA1 (patch-make.local) = 174dd71f0c657f1398401b825a4c813b207d04ac
+SHA1 (patch-sources_leximax__combiner.c) = 16cf583cbca9971dfceb6ccb6f63ae20fce0fbb7
+SHA1 (patch-sources_leximin__combiner.c) = 5ab838bc1b7f67893e1e46bdd4807f694b55aaa5
+SHA1 (patch-sources_lexleximax__combiner.c) = 3b5715c0a85787ad73e2909fbf088172e33f1624
+SHA1 (patch-sources_lexleximin__combiner.c) = 49ce2cf6dfcba758615f66b90eba6a2d9911708d
diff --git a/mccs/options.mk b/mccs/options.mk
new file mode 100644
index 0000000000..b8a584b6a3
--- /dev/null
+++ b/mccs/options.mk
@@ -0,0 +1,19 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.mccs
+PKG_OPTIONS_REQUIRED_GROUP= solver
+PKG_OPTIONS_GROUP.solver= lpsolve glpk
+PKG_SUPPORTED_OPTIONS= lpsolve glpk
+PKG_SUGGESTED_OPTIONS= lpsolve
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mglpk)
+BUILD_MAKE_FLAGS+=USEGLPK=1
+.include "../../math/glkp/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mlpsolve)
+BUILD_MAKE_FLAGS+=USELPSOLVE=1
+.include "../../math/lp_solve/buildlink3.mk"
+.endif
diff --git a/mccs/patches/patch-make.local b/mccs/patches/patch-make.local
new file mode 100644
index 0000000000..0ba2987bb1
--- /dev/null
+++ b/mccs/patches/patch-make.local
@@ -0,0 +1,30 @@
+$NetBSD$
+
+--- make.local.orig 2011-08-03 15:03:55.000000000 +0000
++++ make.local
+@@ -11,7 +11,7 @@
+ ifeq ($(USEGLPK),1)
+
+ # Path to GLPK main dir
+-GLPKDIR=$(PWD)/../glpk
++GLPKDIR=/usr/pkg
+
+ # Path to the GPLK include files
+ GLPKINC=$(GLPKDIR)/include/
+@@ -34,13 +34,13 @@ endif
+ ifeq ($(USELPSOLVE),1)
+
+ # Path to the LPSOLVE main dir
+-LPSOLVEDIR=$(PWD)/../lpsolve/dev
++LPSOLVEDIR=/usr/pkg
+
+ # Path to the LPSOLVE include files
+-LPSOLVEINC=${LPSOLVEDIR}
++LPSOLVEINC=${LPSOLVEDIR}/include/lpsolve
+
+ # LPSOLVE library path and options
+-LPSOLVELD=-L${LPSOLVEDIR} -llpsolve55 -Wl,-rpath,${LPSOLVEDIR}
++LPSOLVELD=-L${LPSOLVEDIR}/lib -llpsolve55 -Wl,-rpath,${LPSOLVEDIR}/lib
+
+ endif
+
diff --git a/mccs/patches/patch-sources_leximax__combiner.c b/mccs/patches/patch-sources_leximax__combiner.c
new file mode 100644
index 0000000000..0e09331125
--- /dev/null
+++ b/mccs/patches/patch-sources_leximax__combiner.c
@@ -0,0 +1,31 @@
+$NetBSD$
+
+--- sources/leximax_combiner.c.orig 2011-06-10 14:50:43.000000000 +0000
++++ sources/leximax_combiner.c
+@@ -7,7 +7,7 @@
+
+
+ #include <stdio.h>
+-#include <values.h>
++#include <limits.h>
+ #include <leximax_combiner.h>
+
+ // Compute the number of columns required to handle the combiner
+@@ -34,7 +34,7 @@ int leximax_combiner::column_allocation(
+ // Generate the objective function
+ int leximax_combiner::objective_generation() {
+ int ui;
+- CUDFcoefficient min_y = MAXLONG, max_y = MINLONG, min_ui, max_ui;
++ CUDFcoefficient min_y = LONG_MAX, max_y = LONG_MIN, min_ui, max_ui;
+
+ // Declare criteria values as integer
+ ui = ui_n;
+@@ -117,7 +117,7 @@ int leximax_combiner::set_variable_range
+ // Initialize integer variables
+ void leximax_combiner::initialize_intvars() {
+ int ui;
+- CUDFcoefficient min_y = MAXLONG, max_y = MINLONG, min_ui, max_ui;
++ CUDFcoefficient min_y = LONG_MAX, max_y = LONG_MIN, min_ui, max_ui;
+
+ // Declare criteria values as integer
+ ui = ui_n;
diff --git a/mccs/patches/patch-sources_leximin__combiner.c b/mccs/patches/patch-sources_leximin__combiner.c
new file mode 100644
index 0000000000..7a21d9f02d
--- /dev/null
+++ b/mccs/patches/patch-sources_leximin__combiner.c
@@ -0,0 +1,31 @@
+$NetBSD$
+
+--- sources/leximin_combiner.c.orig 2011-06-10 14:50:43.000000000 +0000
++++ sources/leximin_combiner.c
+@@ -7,7 +7,7 @@
+
+
+ #include <stdio.h>
+-#include <values.h>
++#include <limits.h>
+ #include <leximin_combiner.h>
+
+ // Compute the number of columns required to handle the combiner
+@@ -34,7 +34,7 @@ int leximin_combiner::column_allocation(
+ // Generate the objective function
+ int leximin_combiner::objective_generation() {
+ int ui;
+- CUDFcoefficient min_y = MAXLONG, max_y = MINLONG, min_ui, max_ui;
++ CUDFcoefficient min_y = LONG_MAX, max_y = LONG_MIN, min_ui, max_ui;
+
+ // Declare criteria values as integer
+ ui = ui_n;
+@@ -117,7 +117,7 @@ int leximin_combiner::set_variable_range
+ // Initialize integer variables
+ void leximin_combiner::initialize_intvars() {
+ int ui;
+- CUDFcoefficient min_y = MAXLONG, max_y = MINLONG, min_ui, max_ui;
++ CUDFcoefficient min_y = LONG_MAX, max_y = LONG_MIN, min_ui, max_ui;
+
+ // Declare criteria values as integer
+ ui = ui_n;
diff --git a/mccs/patches/patch-sources_lexleximax__combiner.c b/mccs/patches/patch-sources_lexleximax__combiner.c
new file mode 100644
index 0000000000..866eba8c70
--- /dev/null
+++ b/mccs/patches/patch-sources_lexleximax__combiner.c
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- sources/lexleximax_combiner.c.orig 2011-06-10 14:50:43.000000000 +0000
++++ sources/lexleximax_combiner.c
+@@ -7,7 +7,7 @@
+
+
+ #include <stdio.h>
+-#include <values.h>
++#include <limits.h>
+ #include <lexleximax_combiner.h>
+
+ // Compute the number of columns required to handle the combiner
+@@ -36,7 +36,7 @@ int lexleximax_combiner::objective_gener
+
+ if (n > 0) {
+ int ui = ui_n;
+- CUDFcoefficient min_y = MAXLONG, max_y = MINLONG, min_ui, max_ui;
++ CUDFcoefficient min_y = LONG_MAX, max_y = LONG_MIN, min_ui, max_ui;
+
+ // Declare criteria values as integer
+ CriteriaListIterator crit = criteria->begin();
diff --git a/mccs/patches/patch-sources_lexleximin__combiner.c b/mccs/patches/patch-sources_lexleximin__combiner.c
new file mode 100644
index 0000000000..48d58c01f5
--- /dev/null
+++ b/mccs/patches/patch-sources_lexleximin__combiner.c
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- sources/lexleximin_combiner.c.orig 2011-06-10 14:50:43.000000000 +0000
++++ sources/lexleximin_combiner.c
+@@ -7,7 +7,7 @@
+
+
+ #include <stdio.h>
+-#include <values.h>
++#include <limits.h>
+ #include <lexleximin_combiner.h>
+
+ // Compute the number of columns required to handle the combiner
+@@ -34,7 +34,7 @@ int lexleximin_combiner::column_allocati
+ // Generate the objective function
+ int lexleximin_combiner::objective_generation() {
+ int ui;
+- CUDFcoefficient min_y = MAXLONG, max_y = MINLONG, min_ui, max_ui;
++ CUDFcoefficient min_y = LONG_MAX, max_y = LONG_MIN, min_ui, max_ui;
+
+ // Declare criteria values as integer
+ ui = ui_n;
Home |
Main Index |
Thread Index |
Old Index