- FIX: Adopted to changes of DiagrammeR

- FIX: Analyze sometimes doesn't show all alternatives
gluc · Feb 2, 2016 · 1994988 · 1994988
1 parent 803a35c
commit 1994988
Show file tree

Hide file tree

Showing 18 changed files with 78 additions and 34 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: ahp
 Type: Package
 Title: Analytic Hierarchy Process
-Version: 0.2.6
-Date: 2016-01-15
+Version: 0.2.7
+Date: 2016-02-02
 Author: Christoph Glur
 Maintainer: Christoph Glur <[email protected]>
 VignetteBuilder: knitr
@@ -27,3 +27,4 @@ URL: http://github.com/gluc/ahp
 BugReports: http://github.com/gluc/ahp/issues
 Depends:
     R (>= 3.0)
+RoxygenNote: 5.0.1
diff --git a/NAMESPACE b/NAMESPACE
@@ -1,4 +1,4 @@
-# Generated by roxygen2 (4.1.1): do not edit by hand
+# Generated by roxygen2: do not edit by hand
 
 export(AhpMatrix)
 export(Analyze)

diff --git a/NEWS b/NEWS
@@ -1,5 +1,9 @@
 # All changes to ahp are documented here.
 
+## Version 0.2.7
+- FIX: Adopted to changes of DiagrammeR
+- FIX: Analyze sometimes doesn't show all alternatives
+
 ## Version 0.2.6
 - CHANGE: Rename col Consistency to Inconsistency
 - CHANGE: Remove col Consistency if all values are NA

diff --git a/R/analyze.R b/R/analyze.R
@@ -96,9 +96,11 @@ GetDataFrame <- function(ahpTree,
 
   names(df)[1] <- " "
 
-  if (variable[1] == "priority") df <- df[ , -4]
-  if (all(is.na(df$Inconsistency))) df <- subset(df, select=-c(Inconsistency))
-  else df <- df[ , -5]
+  if (variable[1] == "priority") df$Weight <- NULL
+  else df$Priority <- NULL
+
+  if (all(is.na(df$Inconsistency))) df$Inconsistency <- NULL
+
 
   return (df)
 

diff --git a/R/table.R b/R/table.R
@@ -30,7 +30,8 @@ AnalyzeTable <- function(ahpTree,
                      pruneFun = pruneFun)
   df <- df[ , -1]
 
-  alternatives <- names(df)[-c(1:3, ncol(df))]
+  #alternatives <- names(df)[-c(1:3, ncol(df))]
+  alternatives <- GetAlternativesNames(ahpTree)
   dfw <- df[ , alternatives, drop = FALSE]
 
   dfw[is.na(dfw)] <- 1

diff --git a/R/visualize.R b/R/visualize.R
@@ -69,8 +69,7 @@ GetGraph <- function(ahpTree,
 
   edges <- combine_edges(edges, edgesAlt, edgesAlts)
 
-  graph <- create_graph(nodes)
-  graph <- add_edges(graph, edges)
+  graph <- create_graph(nodes, edges)
 
   return (graph)
 

diff --git a/man/AhpMatrix.Rd b/man/AhpMatrix.Rd
diff --git a/man/Analyze.Rd b/man/Analyze.Rd
diff --git a/man/Calculate.Rd b/man/Calculate.Rd
diff --git a/man/GetPairwiseFromFunction.Rd b/man/GetPairwiseFromFunction.Rd
diff --git a/man/Load.Rd b/man/Load.Rd
diff --git a/man/PrioritiesFromPairwiseMatrixEigenvalues.Rd b/man/PrioritiesFromPairwiseMatrixEigenvalues.Rd
diff --git a/man/PrioritiesFromScoresDefault.Rd b/man/PrioritiesFromScoresDefault.Rd
diff --git a/man/RunGUI.Rd b/man/RunGUI.Rd
diff --git a/man/Visualize.Rd b/man/Visualize.Rd
diff --git a/man/ahp.Rd b/man/ahp.Rd
diff --git a/tests/testthat/test-Analyze.R b/tests/testthat/test-Analyze.R
@@ -1,30 +1,59 @@
 context("ahp analyze")
 
 
+
+test_that("Analyze Identity", {
+  ahpFile <- system.file("extdata", "car.ahp", package="ahp")
+  carAhp <- Load(ahpFile)
+  Calculate(carAhp, pairwiseFun = PrioritiesFromPairwiseMatrixGeometricMean)
+  df <- Analyze(carAhp)
+
+  expect_equal(ncol(df), 8)
+  expect_equal(names(df), c(" ", "Weight", "Odyssey", "Accord Sedan", "CR-V", "Element", "Accord Hybrid", "Pilot"))
+
+})
+
+
+test_that("Analyze Identity 2", {
+  ahpFile <- system.file("extdata", "car.ahp", package="ahp")
+  carAhp <- Load(ahpFile)
+  Calculate(carAhp)
+  df <- Analyze(carAhp, variable = "priority")
+
+  expect_equal(ncol(df), 9)
+  expect_equal(names(df), c(" ", "Priority", "Odyssey", "Accord Sedan", "CR-V", "Element", "Accord Hybrid", "Pilot", "Inconsistency"))
+
+})
+
+
+
 test_that("Analyze Prune", {
   ahpFile <- system.file("extdata", "car.ahp", package="ahp")
   carAhp <- Load(ahpFile)
   Calculate(carAhp)
   df <- Analyze(
           carAhp,
+          sort = "orig",
           pruneFun = function(x, decisionMaker) {
             PruneLevels(x, decisionMaker, 1) &&
               PruneByCutoff(x, decisionMaker, minWeight = 0.05)
           }
         )
 
   expect_equal(nrow(df), 4)
+  expect_equal(names(df), c(" ", "Weight", "Accord Sedan", "Accord Hybrid", "Pilot", "CR-V", "Element", "Odyssey", "Inconsistency"))
 
 })
 
 
 
-test_that("Analyze Prune", {
+test_that("Analyze Prune 2", {
   ahpFile <- system.file("extdata", "car.ahp", package="ahp")
   carAhp <- Load(ahpFile)
   Calculate(carAhp)
   df <- AnalyzeTable(
     carAhp,
+    variable = "priority",
     pruneFun = function(x, decisionMaker) {
       PruneByCutoff(x, decisionMaker, minWeight = 0.6)
     }
@@ -36,3 +65,5 @@ test_that("Analyze Prune", {
 
 
 
+
+
diff --git a/tests/testthat/test-Visualize.R b/tests/testthat/test-Visualize.R
@@ -7,7 +7,10 @@ test_that("Visualize", {
   Calculate(carAhp)
   graph <- GetGraph(carAhp)
   expect_equal(class(graph), "dgr_graph")
-  expect_equal(dim(graph$nodes_df), c(18, 8))
+  expect_equal(dim(graph$nodes_df), c(18, 10))
+  expect_equal(names(graph$nodes_df), c("nodes", "type", "label", "tooltip", "style", "shape", "color", "fillcolor", "penwidth", "fontname"))
+  expect_equal(dim(graph$edges_df), c(24, 7))
+  expect_equal(names(graph$edges_df), c("from", "to", "arrowhead", "color", "penwidth", "rel", "dir"))
 
 })