Skip to content

Commit

Permalink
fix urls for cran
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffreyhanson committed May 11, 2021
1 parent 82f5696 commit 5bb60cf
Show file tree
Hide file tree
Showing 30 changed files with 118 additions and 116 deletions.
1 change: 1 addition & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# oppr 1.0.3 (released)

- CRAN release.
- Fix URLs for CRAN.

# oppr 1.0.2.5

Expand Down
16 changes: 8 additions & 8 deletions R/add_gurobi_solver.R
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ NULL
#' solutions that are of any level of quality (such that the total number of
#' solutions is equal to `number_solutions`), and `2` finding a
#' specified number of solutions that are nearest to optimality. For more
#' information, see the *Gurobi* manual (i.e. <http://www.gurobi.com/documentation/8.0/refman/poolsearchmode.html#parameter:PoolSearchMode>). Defaults to 2.
#' information, see the *Gurobi* manual (i.e. <https://www.gurobi.com/documentation/8.0/refman/poolsearchmode.html#parameter:PoolSearchMode>). Defaults to 2.
#'
#' @param time_limit `numeric` time limit in seconds to run the optimizer.
#' The solver will return the current best solution when this time limit is
Expand All @@ -61,7 +61,7 @@ NULL
#' @param verbose `logical` should information be printed while solving
#' optimization problems?
#'
#' @details [*Gurobi*](http://gurobi.com) is a
#' @details [*Gurobi*](https://www.gurobi.com) is a
#' state-of-the-art commercial optimization software with an R package
#' interface. It is by far the fastest of the solvers supported by this
#' package, however, it is also the only solver that is not freely
Expand All @@ -71,16 +71,16 @@ NULL
#'
#' To install the \pkg{gurobi} package, the
#' [Gurobi](https://www.gurobi.com) optimization suite will first need to
#' be installed (see instructions for [Linux](http://www.gurobi.com/documentation/8.1/quickstart_linux/software_installation_guid.html),
#' [Mac OSX](http://www.gurobi.com/documentation/8.1/quickstart_mac/software_installation_guid.html), and
#' [Windows](http://www.gurobi.com/documentation/8.1/quickstart_windows/software_installation_guid.html) operating systems). Although
#' be installed (see instructions for [Linux](https://www.gurobi.com/documentation/8.1/quickstart_linux/software_installation_guid.html),
#' [Mac OSX](https://www.gurobi.com/documentation/8.1/quickstart_mac/software_installation_guid.html), and
#' [Windows](https://www.gurobi.com/documentation/8.1/quickstart_windows/software_installation_guid.html) operating systems). Although
#' [Gurobi](https://www.gurobi.com) is a commercial software, academics
#' can obtain a
#' [special license for no cost](https://www.gurobi.com/downloads/end-user-license-agreement-academic/). After installing the
#' [Gurobi](https://www.gurobi.com) optimization suite, the \pkg{gurobi}
#' package can then be installed (see instructions for [Linux](http://www.gurobi.com/documentation/8.1/quickstart_linux/r_installing_the_r_package.html),
#' [Mac OSX](http://www.gurobi.com/documentation/8.1/quickstart_mac/r_installing_the_r_package.html), and
#' [Windows](http://www.gurobi.com/documentation/8.1/quickstart_windows/r_installing_the_r_package.html) operating systems).
#' package can then be installed (see instructions for [Linux](https://www.gurobi.com/documentation/8.1/quickstart_linux/r_installing_the_r_package.html),
#' [Mac OSX](https://www.gurobi.com/documentation/8.1/quickstart_mac/r_installing_the_r_package.html), and
#' [Windows](https://www.gurobi.com/documentation/8.1/quickstart_windows/r_installing_the_r_package.html) operating systems).
#'
#' @return [ProjectProblem-class] object with the solver added
#' to it.
Expand Down
14 changes: 7 additions & 7 deletions R/package.R
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ NULL
#'
#' @section Installation:
#' To make the most of this package, the \href{https://bioconductor.org/packages/release/bioc/html/ggtree.html}{\pkg{ggtree}} and
#' \href{http://www.gurobi.com/documentation/8.1/refman/r_api_overview.html}{\pkg{gurobi}} R packages will need to be installed.
#' \href{https://www.gurobi.com/documentation/8.1/refman/r_api_overview.html}{\pkg{gurobi}} R packages will need to be installed.
#' Since the \href{https://bioconductor.org/packages/release/bioc/html/ggtree.html}{\pkg{ggtree}} package is exclusively available
#' at [Bioconductor](https://bioconductor.org)---and is not available on
#' [The Comprehensive R Archive Network](https://cran.r-project.org/)---please
Expand All @@ -37,16 +37,16 @@ NULL
#' If the installation process fails, please consult the
#' [package's online documentation](https://bioconductor.org/packages/release/bioc/html/ggtree.html). To install the \pkg{gurobi} package, the
#' [Gurobi](https://www.gurobi.com) optimization suite will first need to
#' be installed (see instructions for [Linux](http://www.gurobi.com/documentation/8.1/quickstart_linux/software_installation_guid.html),
#' [Mac OSX](http://www.gurobi.com/documentation/8.1/quickstart_mac/software_installation_guid.html), and
#' [Windows](http://www.gurobi.com/documentation/8.1/quickstart_windows/software_installation_guid.html) operating systems). Although
#' be installed (see instructions for [Linux](https://www.gurobi.com/documentation/8.1/quickstart_linux/software_installation_guid.html),
#' [Mac OSX](https://www.gurobi.com/documentation/8.1/quickstart_mac/software_installation_guid.html), and
#' [Windows](https://www.gurobi.com/documentation/8.1/quickstart_windows/software_installation_guid.html) operating systems). Although
#' [Gurobi](https://www.gurobi.com) is a commercial software, academics
#' can obtain a
#' [special license for no cost](https://www.gurobi.com/downloads/end-user-license-agreement-academic/). After installing the
#' [Gurobi](https://www.gurobi.com) optimization suite, the \pkg{gurobi}
#' package can then be installed (see instructions for [Linux](http://www.gurobi.com/documentation/8.1/quickstart_linux/r_installing_the_r_package.html),
#' [Mac OSX](http://www.gurobi.com/documentation/8.1/quickstart_mac/r_installing_the_r_package.html), and
#' [Windows](http://www.gurobi.com/documentation/8.1/quickstart_windows/r_installing_the_r_package.html) operating systems).
#' package can then be installed (see instructions for [Linux](https://www.gurobi.com/documentation/8.1/quickstart_linux/r_installing_the_r_package.html),
#' [Mac OSX](https://www.gurobi.com/documentation/8.1/quickstart_mac/r_installing_the_r_package.html), and
#' [Windows](https://www.gurobi.com/documentation/8.1/quickstart_windows/r_installing_the_r_package.html) operating systems).
#'
#' @seealso Please refer to the package vignette for more information and worked
#' examples. This can be accessed using the code
Expand Down
2 changes: 1 addition & 1 deletion R/solvers.R
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ NULL
#' currently installed on the system.}
#'
#' \item{[add_gurobi_solver()]}{
#' [*Gurobi*](http://gurobi.com)
#' [*Gurobi*](https://www.gurobi.com)
#' is a state-of-the-art commercial optimization software with an R package
#' interface. It is by far the fastest solver that can be used by
#' this package, however, it is also the only solver that is not freely
Expand Down
2 changes: 1 addition & 1 deletion README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ p <- problem(projects = sim_projects, actions = sim_actions,
print(p)
```

Next, we can solve this problem to obtain a solution. By default, we will obtain the optimal solution to our problem using an exact algorithm solver (e.g. using [Gurobi](http://www.gurobi.com/) or [lpSolveAPI](https://cran.r-project.org/package=lpSolveAPI)).
Next, we can solve this problem to obtain a solution. By default, we will obtain the optimal solution to our problem using an exact algorithm solver (e.g. using [Gurobi](https://www.gurobi.com/) or [lpSolveAPI](https://cran.r-project.org/package=lpSolveAPI)).

```{r, message = FALSE, warning = FALSE}
# solve problem
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ print(p)

Next, we can solve this problem to obtain a solution. By default, we
will obtain the optimal solution to our problem using an exact algorithm
solver (e.g. using [Gurobi](http://www.gurobi.com/) or
solver (e.g. using [Gurobi](https://www.gurobi.com/) or
[lpSolveAPI](https://cran.r-project.org/package=lpSolveAPI)).

``` r
Expand Down
8 changes: 4 additions & 4 deletions docs/articles/oppr.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions docs/news/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pkgdown: 1.6.1.9001
pkgdown_sha: c9e7dde4c5ca066f4a797ff201ead380f702473f
articles:
oppr: oppr.html
last_built: 2021-05-10T22:16Z
last_built: 2021-05-11T07:05Z
urls:
reference: https://prioritizr.github.io/oppr/reference
article: https://prioritizr.github.io/oppr/articles
Expand Down
Binary file modified docs/reference/Rplot001.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 5bb60cf

Please sign in to comment.