Skip to content

Commit

Permalink
version 1.5.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Lars Relund Nielsen authored and cran-robot committed Feb 22, 2024
1 parent a9b226c commit d4ca9e0
Show file tree
Hide file tree
Showing 27 changed files with 1,238 additions and 1,010 deletions.
10 changes: 5 additions & 5 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Package: gMOIP
Type: Package
Title: Tools for 2D and 3D Plots of Single and Multi-Objective
Linear/Integer Programming Models
Version: 1.5.0
Version: 1.5.2
Authors@R: person("Lars", "Relund Nielsen", email = "lars@relund.dk", role = c("aut", "cre"),
comment = c(ORCID = "0000-0002-4802-3071"))
URL: https://relund.github.io/gMOIP/, https://github.com/relund/gMOIP/
Expand All @@ -16,19 +16,19 @@ Description: Make 2D and 3D plots of linear programming (LP),
License: GPL (>= 3.3.2)
Language: en-US
Encoding: UTF-8
RoxygenNote: 7.2.3
RoxygenNote: 7.3.1
Depends: R (>= 3.5.0)
Imports: ggrepel, geometry, ggplot2, rgl, MASS, Matrix, grDevices,
stats, Rfast, plyr, tidyselect, tidyr, tibble, purrr, dplyr,
rlang, png, sp
rlang, png, sp, eaf
Suggests: tikzDevice, grid, gridExtra, knitr, rmarkdown, roxygen2,
ggsci, magrittr, scales, pdftools, testthat (>= 2.1.0),
webshot2
VignetteBuilder: knitr
NeedsCompilation: no
Packaged: 2023-05-26 09:29:00 UTC; au15463
Packaged: 2024-02-21 20:03:49 UTC; au15463
Author: Lars Relund Nielsen [aut, cre]
(<https://orcid.org/0000-0002-4802-3071>)
Maintainer: Lars Relund Nielsen <lars@relund.dk>
Repository: CRAN
Date/Publication: 2023-05-26 11:20:02 UTC
Date/Publication: 2024-02-21 21:30:05 UTC
52 changes: 26 additions & 26 deletions MD5
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
37ea20fa9d5c8adaa9911bcacd2df33f *DESCRIPTION
bf5caf77a709d6e9e08781d76f7c5f02 *DESCRIPTION
1447549699eeb9e263f215b5c6c1c07e *NAMESPACE
089f1f658a65efc4aadf51efd088609f *NEWS.md
ddacd01b153084ab2c2383f263ae0385 *NEWS.md
214b8d2a13cb102ab0a3c937c469ed44 *R/functions.R
d6acbdaf413c8c17db61ab8dd9715c00 *R/hull.R
e5fad87b39964326a4b2244331780df3 *R/ndset.R
1183439ada6032147a4cca9974ed6abf *R/hull.R
d1f600637e987abf748e78eb3f9cba54 *R/ndset.R
b5dee89112c2479b7caf3af9d525c2bf *R/package_doc.R
805f92c5aade13e6439faac1c5fcf041 *R/plot.R
c05372a238c6ebf32fd5592b0680d04e *build/vignette.rds
52a47c67e28cd4924010f78e753838b4 *R/plot.R
9941cd435b8a6bbe3beb843bac486220 *build/vignette.rds
936eecd3359181aa3bd3b056d0cef533 *inst/WORDLIST
50a5843cadc9b3431e2ee1b25df0a30c *inst/doc/bi-objective_2x.R
8f25e3b072bed9c1334251bbfeb3ce8a *inst/doc/bi-objective_2x.R
1e29f80c945bac41f3a89d0aabf4129c *inst/doc/bi-objective_2x.Rmd
726832955db7bd53e4600406608a4369 *inst/doc/bi-objective_2x.html
13d0b61a12126c3420a47c2353677e05 *inst/doc/bi-objective_3x_ex1.R
4c44de2063032acaade1f0628267f4a1 *inst/doc/bi-objective_2x.html
843489bcea17a3efb09093f0af7a6278 *inst/doc/bi-objective_3x_ex1.R
55050a779be09b23e15db7cd38f683d1 *inst/doc/bi-objective_3x_ex1.Rmd
c1cb8ee4ada21cbcd9885936de1533e2 *inst/doc/bi-objective_3x_ex1.html
41daa3167281585e94ffc820ff78513f *inst/doc/intro.R
620648ed8e151c9f7a2f288b2d99c263 *inst/doc/bi-objective_3x_ex1.html
be2b43069ac1d242c7dfffca360459d0 *inst/doc/intro.R
a43cf045bdeffe78923e78e7555fbd4c *inst/doc/intro.Rmd
2cbe69e29b5cd804b415c212f0a8ee35 *inst/doc/intro.html
ca8e35f10b19be8c33f0536e8dea70fa *inst/doc/polytope_2d.R
2fafbeba48e688ba828514d6be6654bc *inst/doc/intro.html
b1e74b14b81121e4f734c399d2e1f3e9 *inst/doc/polytope_2d.R
fe0d7c446096155964ae7f335f7706fb *inst/doc/polytope_2d.Rmd
89db57f08e24431d15e12b856919c140 *inst/doc/polytope_2d.html
2e3735319048065110e6de0b52d5accc *inst/doc/polytope_3d_ex1.R
ce74b86592a97427ba77d5be443f9e5e *inst/doc/polytope_2d.html
a37dedb318fd87632fa2559f66b6ac64 *inst/doc/polytope_3d_ex1.R
8230331a3182286fc0fb0e401d132abf *inst/doc/polytope_3d_ex1.Rmd
0f1fb3f5058b15b72ee3aa9ec4abbea5 *inst/doc/polytope_3d_ex1.html
1d469fe6df139747c203d3a4c8f2b6e6 *inst/doc/tri-objective.R
e6af7105a8c179ae0c6fcce1eff04600 *inst/doc/tri-objective.Rmd
934b673e955c98aeb070793c66a823a7 *inst/doc/tri-objective.html
a592784d2c52532ad74ee84723d47e37 *inst/doc/polytope_3d_ex1.html
a58d80713d33af2ca96cb9f6ded8ba18 *inst/doc/tri-objective.R
e44b9b75385238c9880a7ce8ad39e6fc *inst/doc/tri-objective.Rmd
ac16d0fe68a4adcf375423ac5be71885 *inst/doc/tri-objective.html
1a9b9c4e6e500951767ce45a73250c2c *inst/examples/3d_interactive.Rmd
727f5ee1109a0f04e23f7005eda0f977 *inst/examples/3d_interactive.html
88786ea83c18d6dbd3eca916d80daa24 *inst/examples/ex_criterion.R
b05faa0065fa3590c08572d5f4b6aaaa *inst/examples/ex_polytope.R
6116aab6f4db3fe2071d04a05f6c418f *man/addNDSet.Rd
b4cd761f563785353c1ea94632bb2251 *man/addNDSet.Rd
c65049610bfec323a900928ae81a7670 *man/addNDSet2D.Rd
ca9f8955cd9c849ab5536fb249c00937 *man/addRays.Rd
8b6dc0c479a94d0d808b902fda7c45dc *man/binaryPoints.Rd
c41ce92c0e637f57330fb7733b1c3158 *man/classifyNDSet.Rd
0cca337518b0a13b2ed64d13c0893a32 *man/classifyNDSet.Rd
36c3f61cf5ce7015ac4448f1081697d5 *man/convexHull.Rd
f409748078df5a5c35d6169ee3c558f7 *man/cornerPoints.Rd
583c100a2abc5564dbc6fed00456ffe2 *man/cornerPointsCont.Rd
Expand All @@ -52,11 +52,11 @@ abcc85a8eacfa0101a013bff042732fb *man/figures/README-ilp-1.png
e27eef1c5da09b0acc6e1852cb588bd4 *man/finalize3D.Rd
a34a321f1ac84bdbff346c7356d51679 *man/gMOIP-package.Rd
8c8ff0c7e182f0fa6108b6d40c0b4607 *man/gMOIPTheme.Rd
a7ba50886f076ddf3b2e7b8688b25e0b *man/genNDSet.Rd
5ff859821fe588e0b5bcd187f6a7aafb *man/genSample.Rd
974f69bb082fc73bbe72fce53cb90a5e *man/genNDSet.Rd
3484360e5073482c4e5c83ba38183422 *man/genSample.Rd
fc52950811bc6bb3905d785c77123395 *man/getTexture.Rd
d43075cb1534099901aa161f43ec6ef0 *man/hullSegment.Rd
314754627ac8b16e19998d6da4a1abb0 *man/inHull.Rd
fe930357fe1d55c4442bd9b249fc5e63 *man/inHull.Rd
f2bff68feb2391772f2e39d2d8fbaf0c *man/ini3D.Rd
3cfb5f0ab19ec51a827bfd7440b7295e *man/integerPoints.Rd
caf723f3753b87888a181a2c4d8049c0 *man/loadView.Rd
Expand All @@ -75,7 +75,7 @@ daf669dfcb5803d65adc4c3e3b74e085 *man/plotPlane3D.Rd
cbc9c53aac91657b97a28c2d64f86359 *man/plotPolytope.Rd
88c432b7f7172309106aa30293c50eec *man/plotPolytope2D.Rd
bb2d9bffe007a6661eeb6d8ea0f5fd44 *man/plotPolytope3D.Rd
873d87313825b7655e7e9b0935487691 *man/plotRectangle3D.Rd
4b10afbe333f1f4fc5c5a9e1e8fd91e5 *man/plotRectangle3D.Rd
9925b701f6d9bdabbbde5f4fd7b2e7c6 *man/plotTeX3D.Rd
556b23db0ecc258d0b4480d864778746 *man/plotTitleTeX3D.Rd
b5fec02450307961e886c8d2163b7622 *man/pngSize.Rd
Expand All @@ -87,4 +87,4 @@ b1f6f8b5242d9e88ee02d0a8b8b2fa98 *man/slices.Rd
a43cf045bdeffe78923e78e7555fbd4c *vignettes/intro.Rmd
fe0d7c446096155964ae7f335f7706fb *vignettes/polytope_2d.Rmd
8230331a3182286fc0fb0e401d132abf *vignettes/polytope_3d_ex1.Rmd
e6af7105a8c179ae0c6fcce1eff04600 *vignettes/tri-objective.Rmd
e44b9b75385238c9880a7ce8ad39e6fc *vignettes/tri-objective.Rmd
8 changes: 8 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
# gMOIP 1.5.2

* Updated classification algorithm for nondominated sets.

# gMOIP 1.5.1

* Updated filtering algorithm for nondominated sets.

# gMOIP 1.5.0

* Fix bug concerning degeneration.
Expand Down
2 changes: 2 additions & 0 deletions R/hull.R
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ dimFace<-function(pts, dim = NULL) {
#' pt <- matrix(c(0,0, 1,1, 4,4), ncol = 2, byrow = TRUE)
#' inHull(pt, vertices)
#'
#' \donttest{
#' ## in 3D
#' vertices <- matrix(c(2,2,2), ncol = 3, byrow = TRUE)
#' pt <- matrix(c(1,1,1, 3,3,3, 2,2,2, 3,3,2), ncol = 3, byrow = TRUE)
Expand Down Expand Up @@ -131,6 +132,7 @@ dimFace<-function(pts, dim = NULL) {
#' plotPoints3D(pt, addText = TRUE)
#' finalize3D()
#' inHull(pt, vertices)
#' }
#'
#' ## In 5D
#' vertices <- matrix(c(4,0,0,0,0, 0,4,0,0,0, 0,0,4,0,0, 0,0,0,4,0, 0,0,0,0,4, 0,0,0,0,0),
Expand Down

0 comments on commit d4ca9e0

Please sign in to comment.