From dadd7374c3098aada1f90e9c2d7c41149c35dcc0 Mon Sep 17 00:00:00 2001 From: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@hhu.de> Date: Mon, 18 Apr 2016 12:35:30 +0200 Subject: [PATCH] changes done due to uwe ligges request --- DESCRIPTION | 19 ++++++++++--------- inst/NEWS.Rd | 8 ++++++++ man/addColsCLP.Rd | 5 +++-- man/addRowsCLP.Rd | 5 +++-- man/chgColLowerCLP.Rd | 5 +++-- man/chgColUpperCLP.Rd | 5 +++-- man/chgObjCoefsCLP.Rd | 5 +++-- man/chgRowLowerCLP.Rd | 5 +++-- man/chgRowUpperCLP.Rd | 5 +++-- man/clpAPI-package.Rd | 5 +++-- man/clpPtr-class.Rd | 5 +++-- man/copyNamesCLP.Rd | 5 +++-- man/delColsCLP.Rd | 5 +++-- man/delProbCLP.Rd | 5 +++-- man/delRowsCLP.Rd | 5 +++-- man/dropNamesCLP.Rd | 5 +++-- man/dualCLP.Rd | 5 +++-- man/getColDualCLP.Rd | 5 +++-- man/getColLowerCLP.Rd | 5 +++-- man/getColPrimCLP.Rd | 5 +++-- man/getColUpperCLP.Rd | 5 +++-- man/getIndCLP.Rd | 5 +++-- man/getLogLevelCLP.Rd | 5 +++-- man/getNnzCLP.Rd | 5 +++-- man/getNumColsCLP.Rd | 5 +++-- man/getNumNnzCLP.Rd | 5 +++-- man/getNumRowsCLP.Rd | 5 +++-- man/getObjCoefsCLP.Rd | 5 +++-- man/getObjDirCLP.Rd | 5 +++-- man/getObjValCLP.Rd | 5 +++-- man/getRowDualCLP.Rd | 5 +++-- man/getRowLowerCLP.Rd | 5 +++-- man/getRowPrimCLP.Rd | 5 +++-- man/getRowUpperCLP.Rd | 5 +++-- man/getScaleFlagCLP.Rd | 5 +++-- man/getSolStatusCLP.Rd | 5 +++-- man/getVecLenCLP.Rd | 5 +++-- man/getVecStartCLP.Rd | 5 +++-- man/idiotCLP.Rd | 5 +++-- man/initProbCLP.Rd | 5 +++-- man/lengthNamesCLP.Rd | 5 +++-- man/loadMatrixCLP.Rd | 5 +++-- man/loadProblemCLP.Rd | 5 +++-- man/primalCLP.Rd | 5 +++-- man/printModelCLP.Rd | 5 +++-- man/probNameCLP.Rd | 5 +++-- man/readMPSCLP.Rd | 5 +++-- man/resizeCLP.Rd | 5 +++-- man/restoreModelCLP.Rd | 5 +++-- man/return_codeCLP.Rd | 5 +++-- man/saveModelCLP.Rd | 5 +++-- man/scaleModelCLP.Rd | 5 +++-- man/setLogLevelCLP.Rd | 5 +++-- man/setObjDirCLP.Rd | 5 +++-- man/solveInitialBarrierCLP.Rd | 5 +++-- man/solveInitialBarrierNoCrossCLP.Rd | 5 +++-- man/solveInitialCLP.Rd | 5 +++-- man/solveInitialDualCLP.Rd | 5 +++-- man/solveInitialPrimalCLP.Rd | 5 +++-- man/status_codeCLP.Rd | 5 +++-- man/versionCLP.Rd | 5 +++-- src/Makevars.win | 2 +- 62 files changed, 196 insertions(+), 128 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 6fc429c..4cec144 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,19 +1,20 @@ Package: clpAPI Type: Package Title: R Interface to C API of COIN-OR Clp -Version: 1.2.6 -Date: 2013-10-26 -Authors@R: c(person("Gabriel", "Gelius-Dietrich", role = c("aut", "cre"), email = "geliudie@uni-duesseldorf.de")) +Version: 1.2.7 +Date: 2016-04-18 +Authors@R: c(person(c("C.", "Jonathan"), "Fritzemeier", role = c("cre", "ctb"), email = "clausjonathan.fritzemeier@uni-duesseldorf.de"), + person("Gabriel", "Gelius-Dietrich", role = c("aut"), email = "geliudie@uni-duesseldorf.de")) Depends: R (>= 2.6.0) Imports: methods -Description: R Interface to C API of COIN-OR Clp, depends on COIN-OR Clp Version >= 1.12.0 +Description: R Interface to C API of COIN-OR Clp, depends on COIN-OR Clp Version >= 1.12.0. SystemRequirements: COIN-OR Clp (>= 1.12.0) -License: GPL-3 +License: GPL-3 | file LICENSE LazyLoad: yes Collate: generics.R clp_ptrClass.R clp.R clpAPI.R zzz.R -Packaged: 2013-10-26 16:15:58 UTC; gabriel -Author: Gabriel Gelius-Dietrich [aut, cre] -Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> +Packaged: 2016-04-18 09:33:15 UTC; jonathan +Author: C. Jonathan Fritzemeier [cre, ctb], Gabriel Gelius-Dietrich [aut] +Maintainer: C. Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> NeedsCompilation: yes Repository: CRAN -Date/Publication: 2013-10-26 19:08:53 +Date/Publication: 2016-04-18 09:33:15 diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd index 59d6fe5..206ab03 100644 --- a/inst/NEWS.Rd +++ b/inst/NEWS.Rd @@ -4,6 +4,14 @@ \title{clpAPI News} \encoding{UTF-8} +% ---------------------------------------------------------------------------- % +\section{Changes in version 1.2.7 2016-04-18}{ + \itemize{ + \item added \code{-lz} to \file{Makevars.win} + \item changed maintainer + \item added a period at the end of your Description line in your DESCRIPTION file. + } +} % ---------------------------------------------------------------------------- % \section{Changes in version 1.2.6 2013-10-26}{ diff --git a/man/addColsCLP.Rd b/man/addColsCLP.Rd index 5335e5d..2227ae3 100644 --- a/man/addColsCLP.Rd +++ b/man/addColsCLP.Rd @@ -63,9 +63,10 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/addRowsCLP.Rd b/man/addRowsCLP.Rd index 9e29fea..33e5ad5 100644 --- a/man/addRowsCLP.Rd +++ b/man/addRowsCLP.Rd @@ -60,9 +60,10 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/chgColLowerCLP.Rd b/man/chgColLowerCLP.Rd index 980f850..0e02953 100644 --- a/man/chgColLowerCLP.Rd +++ b/man/chgColLowerCLP.Rd @@ -43,10 +43,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/chgColUpperCLP.Rd b/man/chgColUpperCLP.Rd index 26dd4d5..c435a71 100644 --- a/man/chgColUpperCLP.Rd +++ b/man/chgColUpperCLP.Rd @@ -43,10 +43,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/chgObjCoefsCLP.Rd b/man/chgObjCoefsCLP.Rd index b523388..9527263 100644 --- a/man/chgObjCoefsCLP.Rd +++ b/man/chgObjCoefsCLP.Rd @@ -43,10 +43,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/chgRowLowerCLP.Rd b/man/chgRowLowerCLP.Rd index fe8b81c..361744f 100644 --- a/man/chgRowLowerCLP.Rd +++ b/man/chgRowLowerCLP.Rd @@ -43,10 +43,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/chgRowUpperCLP.Rd b/man/chgRowUpperCLP.Rd index 7ced423..399006d 100644 --- a/man/chgRowUpperCLP.Rd +++ b/man/chgRowUpperCLP.Rd @@ -43,10 +43,11 @@ chgRowUpperCLP(lp, rub) } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/clpAPI-package.Rd b/man/clpAPI-package.Rd index ceb9d21..fa5b4a7 100644 --- a/man/clpAPI-package.Rd +++ b/man/clpAPI-package.Rd @@ -23,11 +23,12 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ package } \keyword{ optimize} diff --git a/man/clpPtr-class.Rd b/man/clpPtr-class.Rd index b77a752..69502ed 100644 --- a/man/clpPtr-class.Rd +++ b/man/clpPtr-class.Rd @@ -68,11 +68,12 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \seealso{ \code{\link{initProbCLP}} } diff --git a/man/copyNamesCLP.Rd b/man/copyNamesCLP.Rd index fafa201..946a5b8 100644 --- a/man/copyNamesCLP.Rd +++ b/man/copyNamesCLP.Rd @@ -47,10 +47,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/delColsCLP.Rd b/man/delColsCLP.Rd index a7eb20c..93e2a03 100644 --- a/man/delColsCLP.Rd +++ b/man/delColsCLP.Rd @@ -46,10 +46,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/delProbCLP.Rd b/man/delProbCLP.Rd index 4198af8..57d16e4 100644 --- a/man/delProbCLP.Rd +++ b/man/delProbCLP.Rd @@ -39,10 +39,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/delRowsCLP.Rd b/man/delRowsCLP.Rd index 22048b7..d6393f5 100644 --- a/man/delRowsCLP.Rd +++ b/man/delRowsCLP.Rd @@ -46,10 +46,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/dropNamesCLP.Rd b/man/dropNamesCLP.Rd index 626162e..e33b228 100644 --- a/man/dropNamesCLP.Rd +++ b/man/dropNamesCLP.Rd @@ -39,10 +39,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/dualCLP.Rd b/man/dualCLP.Rd index f488018..756753c 100644 --- a/man/dualCLP.Rd +++ b/man/dualCLP.Rd @@ -42,10 +42,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/getColDualCLP.Rd b/man/getColDualCLP.Rd index 52d9e34..ebae377 100644 --- a/man/getColDualCLP.Rd +++ b/man/getColDualCLP.Rd @@ -40,10 +40,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/getColLowerCLP.Rd b/man/getColLowerCLP.Rd index bc9abcf..37d6080 100644 --- a/man/getColLowerCLP.Rd +++ b/man/getColLowerCLP.Rd @@ -41,10 +41,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/getColPrimCLP.Rd b/man/getColPrimCLP.Rd index 5279983..5f1b0ce 100644 --- a/man/getColPrimCLP.Rd +++ b/man/getColPrimCLP.Rd @@ -40,10 +40,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/getColUpperCLP.Rd b/man/getColUpperCLP.Rd index 02bf1b2..dc7658f 100644 --- a/man/getColUpperCLP.Rd +++ b/man/getColUpperCLP.Rd @@ -41,10 +41,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/getIndCLP.Rd b/man/getIndCLP.Rd index a870cac..49101dd 100644 --- a/man/getIndCLP.Rd +++ b/man/getIndCLP.Rd @@ -41,10 +41,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/getLogLevelCLP.Rd b/man/getLogLevelCLP.Rd index 8bffd7e..ad250cf 100644 --- a/man/getLogLevelCLP.Rd +++ b/man/getLogLevelCLP.Rd @@ -40,10 +40,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/getNnzCLP.Rd b/man/getNnzCLP.Rd index d823364..1bf71ef 100644 --- a/man/getNnzCLP.Rd +++ b/man/getNnzCLP.Rd @@ -42,10 +42,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/getNumColsCLP.Rd b/man/getNumColsCLP.Rd index 36f0bb6..381b585 100644 --- a/man/getNumColsCLP.Rd +++ b/man/getNumColsCLP.Rd @@ -39,10 +39,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/getNumNnzCLP.Rd b/man/getNumNnzCLP.Rd index f13687a..3325cc9 100644 --- a/man/getNumNnzCLP.Rd +++ b/man/getNumNnzCLP.Rd @@ -39,10 +39,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/getNumRowsCLP.Rd b/man/getNumRowsCLP.Rd index b00b573..ac40b38 100644 --- a/man/getNumRowsCLP.Rd +++ b/man/getNumRowsCLP.Rd @@ -39,10 +39,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/getObjCoefsCLP.Rd b/man/getObjCoefsCLP.Rd index a6a9a78..c4435aa 100644 --- a/man/getObjCoefsCLP.Rd +++ b/man/getObjCoefsCLP.Rd @@ -40,10 +40,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/getObjDirCLP.Rd b/man/getObjDirCLP.Rd index a004dae..894aa8f 100644 --- a/man/getObjDirCLP.Rd +++ b/man/getObjDirCLP.Rd @@ -40,10 +40,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/getObjValCLP.Rd b/man/getObjValCLP.Rd index 53b846c..2f9c982 100644 --- a/man/getObjValCLP.Rd +++ b/man/getObjValCLP.Rd @@ -39,10 +39,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/getRowDualCLP.Rd b/man/getRowDualCLP.Rd index 52a9517..fd5b0d5 100644 --- a/man/getRowDualCLP.Rd +++ b/man/getRowDualCLP.Rd @@ -40,10 +40,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/getRowLowerCLP.Rd b/man/getRowLowerCLP.Rd index bed6a18..f5ff611 100644 --- a/man/getRowLowerCLP.Rd +++ b/man/getRowLowerCLP.Rd @@ -40,10 +40,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/getRowPrimCLP.Rd b/man/getRowPrimCLP.Rd index 838cd41..5201191 100644 --- a/man/getRowPrimCLP.Rd +++ b/man/getRowPrimCLP.Rd @@ -40,10 +40,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/getRowUpperCLP.Rd b/man/getRowUpperCLP.Rd index fb3b78d..e1c4e18 100644 --- a/man/getRowUpperCLP.Rd +++ b/man/getRowUpperCLP.Rd @@ -40,10 +40,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/getScaleFlagCLP.Rd b/man/getScaleFlagCLP.Rd index 33415d3..8d67f53 100644 --- a/man/getScaleFlagCLP.Rd +++ b/man/getScaleFlagCLP.Rd @@ -40,10 +40,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/getSolStatusCLP.Rd b/man/getSolStatusCLP.Rd index 26d8226..d7d2cae 100644 --- a/man/getSolStatusCLP.Rd +++ b/man/getSolStatusCLP.Rd @@ -41,10 +41,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/getVecLenCLP.Rd b/man/getVecLenCLP.Rd index 0c7f678..1746ae8 100644 --- a/man/getVecLenCLP.Rd +++ b/man/getVecLenCLP.Rd @@ -41,10 +41,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/getVecStartCLP.Rd b/man/getVecStartCLP.Rd index a061121..a3cb436 100644 --- a/man/getVecStartCLP.Rd +++ b/man/getVecStartCLP.Rd @@ -41,10 +41,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/idiotCLP.Rd b/man/idiotCLP.Rd index 95d05af..57686b9 100644 --- a/man/idiotCLP.Rd +++ b/man/idiotCLP.Rd @@ -42,10 +42,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/initProbCLP.Rd b/man/initProbCLP.Rd index 443f9a0..77825ec 100644 --- a/man/initProbCLP.Rd +++ b/man/initProbCLP.Rd @@ -37,10 +37,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/lengthNamesCLP.Rd b/man/lengthNamesCLP.Rd index 78f42d1..e9846a0 100644 --- a/man/lengthNamesCLP.Rd +++ b/man/lengthNamesCLP.Rd @@ -39,10 +39,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/loadMatrixCLP.Rd b/man/loadMatrixCLP.Rd index 13110a1..3815f64 100644 --- a/man/loadMatrixCLP.Rd +++ b/man/loadMatrixCLP.Rd @@ -53,10 +53,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/loadProblemCLP.Rd b/man/loadProblemCLP.Rd index fa7fb59..37a8a5d 100644 --- a/man/loadProblemCLP.Rd +++ b/man/loadProblemCLP.Rd @@ -71,10 +71,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/primalCLP.Rd b/man/primalCLP.Rd index d6d708b..5db4923 100644 --- a/man/primalCLP.Rd +++ b/man/primalCLP.Rd @@ -42,10 +42,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/printModelCLP.Rd b/man/printModelCLP.Rd index 49feebd..e8b99d9 100644 --- a/man/printModelCLP.Rd +++ b/man/printModelCLP.Rd @@ -43,10 +43,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/probNameCLP.Rd b/man/probNameCLP.Rd index 10e3810..a44c18a 100644 --- a/man/probNameCLP.Rd +++ b/man/probNameCLP.Rd @@ -43,9 +43,10 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/readMPSCLP.Rd b/man/readMPSCLP.Rd index 4f1ce2b..509d181 100644 --- a/man/readMPSCLP.Rd +++ b/man/readMPSCLP.Rd @@ -48,10 +48,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/resizeCLP.Rd b/man/resizeCLP.Rd index 6e39c0f..cc0dd57 100644 --- a/man/resizeCLP.Rd +++ b/man/resizeCLP.Rd @@ -53,11 +53,12 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \seealso{ \code{\link{delRowsCLP}} and \code{\link{delColsCLP}}. } diff --git a/man/restoreModelCLP.Rd b/man/restoreModelCLP.Rd index 5ef4e0f..a78deba 100644 --- a/man/restoreModelCLP.Rd +++ b/man/restoreModelCLP.Rd @@ -42,10 +42,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/return_codeCLP.Rd b/man/return_codeCLP.Rd index 1a90ab2..9f03213 100644 --- a/man/return_codeCLP.Rd +++ b/man/return_codeCLP.Rd @@ -32,10 +32,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/saveModelCLP.Rd b/man/saveModelCLP.Rd index ccd4b85..3c1e9e5 100644 --- a/man/saveModelCLP.Rd +++ b/man/saveModelCLP.Rd @@ -42,10 +42,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/scaleModelCLP.Rd b/man/scaleModelCLP.Rd index a20f472..c629678 100644 --- a/man/scaleModelCLP.Rd +++ b/man/scaleModelCLP.Rd @@ -44,10 +44,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/setLogLevelCLP.Rd b/man/setLogLevelCLP.Rd index d7452ec..4c18fad 100644 --- a/man/setLogLevelCLP.Rd +++ b/man/setLogLevelCLP.Rd @@ -43,10 +43,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/setObjDirCLP.Rd b/man/setObjDirCLP.Rd index 2da198e..e6485e9 100644 --- a/man/setObjDirCLP.Rd +++ b/man/setObjDirCLP.Rd @@ -43,10 +43,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/solveInitialBarrierCLP.Rd b/man/solveInitialBarrierCLP.Rd index 3ff33a9..e69154a 100644 --- a/man/solveInitialBarrierCLP.Rd +++ b/man/solveInitialBarrierCLP.Rd @@ -40,10 +40,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/solveInitialBarrierNoCrossCLP.Rd b/man/solveInitialBarrierNoCrossCLP.Rd index 1cb619a..7d68604 100644 --- a/man/solveInitialBarrierNoCrossCLP.Rd +++ b/man/solveInitialBarrierNoCrossCLP.Rd @@ -41,10 +41,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/solveInitialCLP.Rd b/man/solveInitialCLP.Rd index b510d30..30f2ef8 100644 --- a/man/solveInitialCLP.Rd +++ b/man/solveInitialCLP.Rd @@ -40,10 +40,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/solveInitialDualCLP.Rd b/man/solveInitialDualCLP.Rd index 7d06d17..3e574a6 100644 --- a/man/solveInitialDualCLP.Rd +++ b/man/solveInitialDualCLP.Rd @@ -40,10 +40,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/solveInitialPrimalCLP.Rd b/man/solveInitialPrimalCLP.Rd index 335049e..bb7c66e 100644 --- a/man/solveInitialPrimalCLP.Rd +++ b/man/solveInitialPrimalCLP.Rd @@ -40,10 +40,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/status_codeCLP.Rd b/man/status_codeCLP.Rd index 415961e..4c29cf3 100644 --- a/man/status_codeCLP.Rd +++ b/man/status_codeCLP.Rd @@ -32,10 +32,11 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/man/versionCLP.Rd b/man/versionCLP.Rd index 68f903d..f8ae6b4 100644 --- a/man/versionCLP.Rd +++ b/man/versionCLP.Rd @@ -30,9 +30,10 @@ } \author{ - Gabriel Gelius-Dietrich + Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> - Maintainer: Gabriel Gelius-Dietrich <geliudie@uni-duesseldorf.de> + Maintainer: Claus Jonathan Fritzemeier <clausjonathan.fritzemeier@uni-duesseldorf.de> } + \keyword{ optimize } diff --git a/src/Makevars.win b/src/Makevars.win index ff18ecb..9226d4b 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -1,2 +1,2 @@ PKG_CPPFLAGS=-g -D_R_=1 -DUSE_R=1 -I${CLP_PATH}/include/coin -PKG_LIBS=-L${CLP_PATH}/lib/coin -L${CLP_PATH}/lib -lClp -lCoinUtils -lstdc++ +PKG_LIBS=-L${CLP_PATH}/lib/coin -L${CLP_PATH}/lib -lClp -lCoinUtils -lstdc++ -lz -- GitLab