fixed DiagrammeR problems

gluc · Mar 6, 2018 · 4a85f6e · 4a85f6e
1 parent d025e39
commit 4a85f6e
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 24 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: ahp
 Type: Package
 Title: Analytic Hierarchy Process
-Version: 0.2.11
-Date: 2017-01-05
+Version: 0.2.12
+Date: 2018-03-06
 Author: Christoph Glur
 Maintainer: Christoph Glur <[email protected]>
 VignetteBuilder: knitr
@@ -27,4 +27,4 @@ URL: http://github.com/gluc/ahp
 BugReports: http://github.com/gluc/ahp/issues
 Depends:
     R (>= 3.2.0)
-RoxygenNote: 5.0.1
+RoxygenNote: 6.0.1
diff --git a/NEWS b/NEWS
@@ -1,8 +1,8 @@
 # All changes to ahp are documented here.
 
-## Version 0.2.12 (in progress)
+## Version 0.2.12 (CRAN)
 - FIX: Visualize fontcolor of criteria nodes is now black
-
+- FIX: Fixed problems relating to DiagrammeR changes
 
 ## Version 0.2.11 (CRAN)
 - IMPROVE: Update to latest DiagrammeR updates

diff --git a/R/visualize.R b/R/visualize.R
@@ -82,8 +82,8 @@ GetGraph <- function(ahpTree,
 
   edges <- DiagrammeR::combine_edfs(edges, edgesAlt, edgesAlts)
 
-  graph <- DiagrammeR::create_graph(nodes, edges)
-  graph <- DiagrammeR::set_global_graph_attrs(graph, "rankdir", "TB", "graph")
+  graph <- DiagrammeR::create_graph(nodes, edges, attr_theme = NULL)
+  graph <- DiagrammeR::add_global_graph_attrs(graph, "rankdir", "TB", "graph")
   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