Fixed add_edge! conflicts (#18)

* Exported add_edge! * Fixed add_edge conflicts
zavalab · Mar 7, 2024 · 24ae7bb · 24ae7bb
1 parent 0d3efae
commit 24ae7bb
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 10 deletions.
diff --git a/src/PlasmoData.jl b/src/PlasmoData.jl
@@ -5,9 +5,12 @@ using SparseArrays
 using Statistics
 using LinearAlgebra
 
+import Graphs: add_edge!
+
 export DataGraph,
     DataDiGraph,
     add_node!,
+    add_edge!,
     add_node_data!,
     add_edge_data!,
     adjacency_matrix,

diff --git a/test/DataDiGraph_interface_test.jl b/test/DataDiGraph_interface_test.jl
@@ -10,7 +10,7 @@ for i in 1:length(nodes)
 end
 
 for i in 1:length(edges)
-    PlasmoData.add_edge!(dg, edges[i])
+    add_edge!(dg, edges[i])
     add_edge_data!(dg, edges[i], edge_data[i])
 end
 

diff --git a/test/DataDiGraph_test.jl b/test/DataDiGraph_test.jl
@@ -21,7 +21,7 @@ function build_datadigraph(nodes, edges)
         add_node!(dg, i)
     end
     for (i, j) in edges
-        PlasmoData.add_edge!(dg, i, j)
+        add_edge!(dg, i, j)
     end
     return dg
 end
@@ -108,7 +108,7 @@ end
 # Test add_edge! function 1
 
 for (i, j) in edges
-    PlasmoData.add_edge!(dg, i, j)
+    add_edge!(dg, i, j)
 end
 
 @testset "add_edge! test1" begin

diff --git a/test/DataDiGraph_utils_test.jl b/test/DataDiGraph_utils_test.jl
@@ -10,7 +10,7 @@ for i in 1:length(nodes)
 end
 
 for i in 1:length(edges)
-    PlasmoData.add_edge!(dg, edges[i])
+    add_edge!(dg, edges[i])
     add_edge_data!(dg, edges[i], edge_data[i])
 end
 
@@ -97,7 +97,7 @@ for i in 1:length(nodes)
 end
 
 for i in 1:length(edges)
-    PlasmoData.add_edge!(dg, edges[i])
+    add_edge!(dg, edges[i])
     add_edge_data!(dg, edges[i], edge_data[i])
 end
 

diff --git a/test/DataGraph_interface_test.jl b/test/DataGraph_interface_test.jl
@@ -10,7 +10,7 @@ for i in 1:length(nodes)
 end
 
 for i in 1:length(edges)
-    PlasmoData.add_edge!(dg, edges[i])
+    add_edge!(dg, edges[i])
     add_edge_data!(dg, edges[i], edge_data[i], "weight")
 end
 

diff --git a/test/DataGraph_test.jl b/test/DataGraph_test.jl
@@ -21,7 +21,7 @@ function build_datagraph(nodes, edges)
         add_node!(dg, i)
     end
     for (i, j) in edges
-        PlasmoData.add_edge!(dg, i, j)
+        add_edge!(dg, i, j)
     end
 
     return dg
@@ -108,7 +108,7 @@ end
 # Test add_edge! function 1
 
 for (i, j) in edges
-    PlasmoData.add_edge!(dg, i, j)
+    add_edge!(dg, i, j)
 end
 
 @testset "add_edge! test" begin
@@ -147,7 +147,7 @@ for i in nodes
 end
 
 for i in edges
-    PlasmoData.add_edge!(dg, i)
+    add_edge!(dg, i)
 end
 
 @testset "add_edge! test" begin

diff --git a/test/function_tests.jl b/test/function_tests.jl
@@ -13,7 +13,7 @@ for i in 1:length(nodes)
 end
 
 for i in 1:length(edges)
-    PlasmoData.add_edge!(ddg, edges[i])
+    add_edge!(ddg, edges[i])
     add_edge_data!(ddg, edges[i], edge_data[i])
 end