Reduced the maximum integer for Concorde to avoid overflows (reported…

… by sarwanpasha).

NEWS.md

@@ -3,6 +3,7 @@
 * Fixed Linkern file management on Windows.
 * Converting distances that only contain 0 and Inf (e.g., from an adjacency matrix) 
   is now fixed for Concorde and Linkern.
+* Reduced the maximum integer for Concorde to avoid overflows (reported by sarwanpasha).
 
 # TSP 1.1-9 (02/02/2020)
 

R/tsp_concorde.R

@@ -64,7 +64,9 @@ tsp_concorde <- function(x, control = NULL){
 
   ## check x
   if(inherits(x, "TSP")){
-    if(n_of_cities(x) < 10) MAX <- 2^15 - 1 else MAX <- 2^31 - 1
+    #if(n_of_cities(x) < 10) MAX <- 2^15 - 1 else MAX <- 2^31 - 1
+    ### MFH: concorde may overflow with 2^31-1
+    if(n_of_cities(x) < 10) MAX <- 2^15 - 1 else MAX <- 2^28 - 1
     x <- .prepare_dist_concorde(x, MAX, control$precision)
 
   }else if(inherits(x, "ETSP")) {
@@ -140,7 +142,8 @@ tsp_linkern <- function(x, control = NULL){
   ## check x
   if(inherits(x, "TSP")) {
 
-    MAX <- 2^31 - 1
+    #MAX <- 2^31 - 1
+    MAX <- 2^28 - 1
     x <- .prepare_dist_concorde(x, MAX, control$precision)
 
   }else if(inherits(x, "ETSP")) {

man/Concorde.Rd

@@ -87,8 +87,8 @@ concorde_help()
 
 data("USCA312")
 
-## run concorde only with fast cuts (-V)
-solve_TSP(USCA312, method = "concorde", control = list(clo = "-V"))
+## run concorde in verbose mode (-v) with fast cuts only (-V)
+solve_TSP(USCA312, method = "concorde", control = list(clo = "-v -V"))
 }
 }
 \keyword{documentation}% at least one, from doc/KEYWORDS