fix #59

prioritizr · Feb 8, 2018 · b5f016e · b5f016e
1 parent 667656e
commit b5f016e
Show file tree

Hide file tree

Showing 42 changed files with 188 additions and 144 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: prioritizr
 Type: Package
-Version: 3.0.3.4
+Version: 3.0.3.5
 Title: Systematic Conservation Prioritization in R
 Description: Conservation prioritization using integer
     programming techniques. To solve large-scale problems, users

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,10 @@
+# prioritizr 3.0.3.5 (unreleased)
+
+- Fix bug where `add_locked_in_constraints` and `add_locked_out_constraints`
+  throw an exception when used with semi-continuous-type decisions (#59).
+- Exception in `compile` thrown when the same planning unit is locked in and
+  locked out now prints the planning unit indices in a readable format.
+
 # prioritizr 3.0.3.4 (unreleased)
 
 - Fix bug where `add_locked_in_constraints` and `add_locked_out_constraints`

diff --git a/R/compile.R b/R/compile.R
@@ -95,7 +95,7 @@ compile.ConservationProblem <- function(x, compressed_formulation = NA, ...) {
   invalid_pu <- which(op$lb()[seq_len(x$number_of_planning_units())] > pu_ub)
   if (length(invalid_pu)) {
     stop("the following planning units have been locked in and locked out:\n",
-      invalid_pu)
+      paste(invalid_pu, collapse = ","))
   }
   # check that all planning units have not been locked out
   if (all(pu_ub == 0))

diff --git a/README.md b/README.md
@@ -42,7 +42,7 @@ Citation
 
 To cite package '*prioritizr*' in publications please use:
 
-    Hanson JO, Schuster R, Morrell N, Strimas-Mackey M, Watts ME, Arcese P, Bennett J, Possingham HP (2017). prioritizr: Systematic Conservation Prioritization in R. R package version 3.0.3.4. https://github.com/prioritizr/prioritizr.
+    Hanson JO, Schuster R, Morrell N, Strimas-Mackey M, Watts ME, Arcese P, Bennett J, Possingham HP (2017). prioritizr: Systematic Conservation Prioritization in R. R package version 3.0.3.5. https://github.com/prioritizr/prioritizr.
 
 Additionally, we keep a [record of publications](https://prioritizr.github.io/prioritizr/articles/publication_record.html) that use *prioritizr*, so please [file an issue on GitHub](https://github.com/prioritizr/prioritizr/issues/new) so we can add it to the list.
 
@@ -167,7 +167,7 @@ print(attr(s1, "runtime"))
 ```
 
     ##  solution_1 
-    ## 0.005816936
+    ## 0.005696058
 
 ``` r
 # extract message returned from solver
@@ -204,7 +204,7 @@ s2 <- solve(p2)
     ##   RHS range        [6e+00, 1e+01]
     ## Found heuristic solution: objective 4020.2
     ## Presolve removed 0 rows and 10 columns
-    ## Presolve time: 0.00s
+    ## Presolve time: 0.02s
     ## Presolved: 5 rows, 80 columns, 400 nonzeros
     ## Variable types: 0 continuous, 80 integer (80 binary)
     ## Presolved: 5 rows, 80 columns, 400 nonzeros
@@ -217,7 +217,7 @@ s2 <- solve(p2)
     ## 
     ##      0     0 3620.46082    0    3 4020.20382 3620.46082  9.94%     -    0s
     ## 
-    ## Explored 1 nodes (11 simplex iterations) in 0.01 seconds
+    ## Explored 1 nodes (11 simplex iterations) in 0.03 seconds
     ## Thread count was 1 (of 4 available processors)
     ## 
     ## Solution count 1: 4020.2 
@@ -259,7 +259,7 @@ s3 <- solve(p3)
     ## Presolved: 221 rows, 188 columns, 832 nonzeros
     ## 
     ## 
-    ## Root relaxation: objective 5.477092e+03, 124 iterations, 0.00 seconds
+    ## Root relaxation: objective 5.477092e+03, 124 iterations, 0.01 seconds
     ## 
     ##     Nodes    |    Current Node    |     Objective Bounds      |     Work
     ##  Expl Unexpl |  Obj  Depth IntInf | Incumbent    BestBd   Gap | It/Node Time
@@ -268,7 +268,7 @@ s3 <- solve(p3)
     ## H    0     0                    6154.1018384 5477.09167  11.0%     -    0s
     ## H    0     0                    5944.9791739 5477.09167  7.87%     -    0s
     ## 
-    ## Explored 1 nodes (124 simplex iterations) in 0.03 seconds
+    ## Explored 1 nodes (124 simplex iterations) in 0.05 seconds
     ## Thread count was 1 (of 4 available processors)
     ## 
     ## Solution count 4: 5944.98 6154.1 6420.2 20287.2 
@@ -308,7 +308,7 @@ s4 <- solve(p4)
     ## Presolved: 468 rows, 377 columns, 1688 nonzeros
     ## 
     ## 
-    ## Root relaxation: objective 5.647064e+03, 348 iterations, 0.01 seconds
+    ## Root relaxation: objective 5.647064e+03, 348 iterations, 0.02 seconds
     ## 
     ##     Nodes    |    Current Node    |     Objective Bounds      |     Work
     ##  Expl Unexpl |  Obj  Depth IntInf | Incumbent    BestBd   Gap | It/Node Time
@@ -343,7 +343,7 @@ s4 <- solve(p4)
     ##   MIR: 2
     ##   Zero half: 23
     ## 
-    ## Explored 27 nodes (1243 simplex iterations) in 0.28 seconds
+    ## Explored 27 nodes (1243 simplex iterations) in 0.42 seconds
     ## Thread count was 1 (of 4 available processors)
     ## 
     ## Solution count 2: 6482.4 12281.1 

diff --git a/docs/articles/gurobi_installation.html b/docs/articles/gurobi_installation.html
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/favicon.ico b/docs/favicon.ico
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/reference/add_boundary_penalties.html b/docs/reference/add_boundary_penalties.html
diff --git a/docs/reference/add_connected_constraints.html b/docs/reference/add_connected_constraints.html