Skip to content

Commit 5bc18db

Browse files
author
Jack Dunham
committed
Fix merge
1 parent a188ad9 commit 5bc18db

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

src/beliefpropagation/beliefpropagationproblem.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ function contract_messages(
8787
end
8888

8989
function default_algorithm(
90-
::Type{<:Algorithm"contract"}; normalize = true, contraction_alg = default_algorithm(Algorithm"exact")
90+
::Type{<:Algorithm"contract"}; normalize = true, contraction_alg = Algorithm("exact")
9191
)
9292
return Algorithm("contract"; normalize, contraction_alg)
9393
end

src/tensornetwork.jl

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ using Dictionaries: AbstractDictionary, Indices, dictionary
44
using Graphs: AbstractSimpleGraph, rem_vertex!, rem_edge!
55
using NamedDimsArrays: AbstractNamedDimsArray, dimnames
66
using NamedGraphs: NamedGraphs, NamedEdge, NamedGraph, vertextype
7-
using NamedGraphs.GraphsExtensions: GraphsExtensions, arranged_edges, vertextype
7+
using NamedGraphs.GraphsExtensions: GraphsExtensions, arranged_edges, arrange_edge, vertextype
88
using NamedGraphs.PartitionedGraphs:
99
AbstractPartitionedGraph,
1010
PartitionedGraphs,
@@ -87,10 +87,7 @@ function fix_links!(tn::AbstractTensorNetwork)
8787
for e in setdiff(arranged_edges(graph), tn_edges)
8888
insert_trivial_link!(tn, e)
8989
end
90-
for edge in setdiff(arranged_edges(graph), arranged_edges(graph_structure))
91-
insert_trivial_link!(network, edge)
92-
end
93-
return network
90+
return tn
9491
end
9592

9693
# Determine the graph structure from the tensors.

0 commit comments

Comments
 (0)