Release 1.0.2, fixing and improving Hsu's transformation.

melvidoni · Oct 8, 2018 · 637c7bf · 637c7bf
1 parent 200058c
commit 637c7bf
Show file tree

Hide file tree

Showing 23 changed files with 68 additions and 42 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: rsppfp
 Title: R's Shortest Path Problem with Forbidden Subpaths
-Version: 1.0.0.0
+Version: 1.0.2
 Authors@R: c(person("Melina", "Vidoni", email = "[email protected]", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-4099-1430")),
              person("Aldo", "Vecchietti", email = "[email protected]", role = "aut"))
 Maintainer: Melina Vidoni <[email protected]>

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,12 @@
-## RSPPFP 1.0.0.0
+## RSPPFP 1.0.2
+Stable release of advanced implementation of R-SPPFP, with minor bug fixes. Released October 2018.
+
+### Minor Bug Fixes and Improvements
+ - Fixed Hsu's transformation: when having more than three columns (`from` and `to`, and an undefined number of attributes) the resulting `gStar` has the attributes in the correct order.
+ - Improved Hsu's transformation: previous to working, it deletes empty rows from the set of forbidden paths. Empty rows are those in which all of the cells contain either only blank spaces or `NA` values.
+
+
+## RSPPFP 1.0.0
 First stable release of advanced implementation of R-SPPFP, released on June 2018.
 
 ### Major Changes

diff --git a/R/hsu.R b/R/hsu.R
@@ -56,7 +56,10 @@ modify_graph_hsu <- function(g, f, cores = 1L) {
   # Transform the graph
   g$from <- as.character(g$from)
   g$to <- as.character(g$to)
-  f[f == ""] <- NA
+
+  # Clean the forbidden paths
+  f <- as.data.frame( apply(f, 2, function(x) gsub("^$|^ $", NA, x)) )
+  f <- f[apply(f,1,function(x)any(!is.na(x))),]
 
   # Get the number of columns
   ncol <- ncol(g)
@@ -123,7 +126,7 @@ modify_graph_hsu <- function(g, f, cores = 1L) {
 
             # Add the link to the predecesor, with all the attributes
             if(ncol > 2) {
-              tempNewArcs[nrow(tempNewArcs) + 1,] <- list(preNode, nodeName, .get_arc_attributes(g, fps[i, j-1], fps[i, j]))
+              tempNewArcs[nrow(tempNewArcs) + 1,] <- c(preNode, nodeName, .get_arc_attributes(g, fps[i, j-1], fps[i, j]))
             }
             # Or without the attributes
             else tempNewArcs[nrow(tempNewArcs) + 1,] <- list(preNode, nodeName)
@@ -145,7 +148,7 @@ modify_graph_hsu <- function(g, f, cores = 1L) {
               if(!identical(newTo, character(0))) {
                 # Write that arc as well, with its attributes
                 if(ncol > 2) {
-                  tempNewArcs[nrow(tempNewArcs) + 1,] <- list(nodeName, newTo,
+                  tempNewArcs[nrow(tempNewArcs) + 1,] <- c(nodeName, newTo,
                                                               .get_arc_attributes(g, fps[i,j-1], fps[i,j]))
                 }
                 # Or without them
@@ -215,7 +218,7 @@ modify_graph_hsu <- function(g, f, cores = 1L) {
        if(l == 2) {
          # Add the link to the predecesor with its attributes
          if(ncol > 2) {
-           tempNewArcs[nrow(tempNewArcs) + 1,] <- list(preNode, nodeName,
+           tempNewArcs[nrow(tempNewArcs) + 1,] <- c(preNode, nodeName,
                                                        .get_arc_attributes(g, f[k,l-1], f[k,l]))
          }
          # Or without them
@@ -250,7 +253,7 @@ modify_graph_hsu <- function(g, f, cores = 1L) {
          else {
            # Add the link to the predecesor, with its attributes
            if(ncol > 2) {
-             tempNewArcs[nrow(tempNewArcs) + 1,] <- list(preNode, nodeName,
+             tempNewArcs[nrow(tempNewArcs) + 1,] <- c(preNode, nodeName,
                                                          .get_arc_attributes(g, f[k,l-1], f[k,l]))
            }
            # Or without them
@@ -328,7 +331,7 @@ modify_graph_hsu <- function(g, f, cores = 1L) {
         if( !any(c(nsName, toNode) %in% secondOutput[[2]]) )
           # Add it with its attributes
           if(ncol > 2) {
-            newArcs[nrow(newArcs) + 1, ] <- list(nn, newTo, .get_arc_attributes(g, nsName, toNode))
+            newArcs[nrow(newArcs) + 1, ] <- c(nn, newTo, .get_arc_attributes(g, nsName, toNode))
           }
         # Or without them
         else newArcs[nrow(newArcs) + 1, ] <- list(nn, newTo)
@@ -340,7 +343,7 @@ modify_graph_hsu <- function(g, f, cores = 1L) {
 
         # Add the new link, but with the original node and its attributes
         if(ncol > 2) {
-          newArcs[nrow(newArcs) + 1, ] <- list(nn, toNode, .get_arc_attributes(g, nsName, toNode))                                    }
+          newArcs[nrow(newArcs) + 1, ] <- c(nn, toNode, .get_arc_attributes(g, nsName, toNode))                                    }
         # Or without them
         else newArcs[nrow(newArcs) + 1, ] <- list(nn, toNode)
 

diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html
diff --git a/docs/articles/benchmark.html b/docs/articles/benchmark.html
diff --git a/docs/articles/igraph.html b/docs/articles/igraph.html
diff --git a/docs/articles/igraph_files/figure-html/unnamed-chunk-4-1.png b/docs/articles/igraph_files/figure-html/unnamed-chunk-4-1.png
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/articles/references.html b/docs/articles/references.html
diff --git a/docs/articles/rsppfp.html b/docs/articles/rsppfp.html
diff --git a/docs/authors.html b/docs/authors.html
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/direct_graph.html b/docs/reference/direct_graph.html
diff --git a/docs/reference/dot-comb.html b/docs/reference/dot-comb.html
diff --git a/docs/reference/dot-get_arc_attributes.html b/docs/reference/dot-get_arc_attributes.html
diff --git a/docs/reference/get_all_nodes.html b/docs/reference/get_all_nodes.html
diff --git a/docs/reference/get_shortest_path.html b/docs/reference/get_shortest_path.html
diff --git a/docs/reference/index.html b/docs/reference/index.html
diff --git a/docs/reference/modify_graph_hsu.html b/docs/reference/modify_graph_hsu.html
diff --git a/docs/reference/modify_graph_vd.html b/docs/reference/modify_graph_vd.html
diff --git a/docs/reference/parse_vpath.html b/docs/reference/parse_vpath.html
diff --git a/docs/reference/rsppfp.html b/docs/reference/rsppfp.html