Une mise-à-jour est prévue le 9 juillet entre 13:00 et 14:00. Le service sera inaccessible ou instable pendant cette période. Merci de votre compréhension.

Commit 67c2b23a authored by Fize Jacques's avatar Fize Jacques

Big change !! Debug comparison using selected graphs !

parent 6130f6cd
......@@ -135,7 +135,7 @@ cdef class Base:
if not G:
f=False
elif len(G)== 0:
f=False
f=False
if selected:
if not index in selected:
f=False
......
......@@ -89,7 +89,7 @@ cdef class AbstractGraphEditDistance(Base):
for i in range(n):
for j in range(i, n):
g1,g2=listgs[i],listgs[j]
f=self.isAccepted(g1,i,selected) & self.isAccepted(g2,j,selected)
f=self.isAccepted(g1,i,selected)
if f:
comparison_matrix[i, j] = self.distance_ged(g1, g2)
else:
......
......@@ -28,7 +28,7 @@ cdef class BP_2(Base):
for i in range(n):
for j in range(i, n):
g1,g2=listgs[i],listgs[j]
f=self.isAccepted(g1,i,selected) & self.isAccepted(g2,j,selected)
f=self.isAccepted(g1,i,selected)
if f:
comparison_matrix[i, j] = self.bp2(g1, g2)
else:
......
......@@ -34,7 +34,7 @@ cdef class HED(Base):
for i in range(n):
for j in range(i, n):
g1,g2=listgs[i],listgs[j]
f=self.isAccepted(g1,i,selected) & self.isAccepted(g2,j,selected)
f=self.isAccepted(g1,i,selected)
if f:
comparison_matrix[i, j] = self.hed(g1, g2)
else:
......
......@@ -19,7 +19,7 @@ cdef class Jaccard(Base):
for i in range(n):
for j in range(i,n):
g1,g2=listgs[i],listgs[j]
f=self.isAccepted(g1,i,selected) & self.isAccepted(g2,j,selected)
f=self.isAccepted(g1,i,selected)
if f:
inter_g=intersection(g1,g2)
union_g=union_(g1,g2)
......
......@@ -63,7 +63,7 @@ cdef class WeisfeleirLehmanKernel(Base):
# Computing the maximum number of nodes in the graphs. It
# will be used in the computation of vectorial
# representation.
if (n_max < graph_list[i].number_of_nodes()):
if n_max < graph_list[i].number_of_nodes():
n_max = graph_list[i].number_of_nodes()
phi = np.zeros((n_nodes, n), dtype=np.uint64)
......
......@@ -18,7 +18,7 @@ cdef class MCS(Base):
for i in range(n):
for j in range(i, n):
g1,g2=listgs[i],listgs[j]
f=self.isAccepted(g1,i,selected) & self.isAccepted(g2,j,selected)
f=self.isAccepted(g1,i,selected)
if f:
comparison_matrix[i, j] = self.s_mcs(g1,g2)
else:
......
......@@ -24,7 +24,7 @@ cdef class VertexEdgeOverlap(Base):
for i in range(n):
for j in range(i,n):
g1,g2 = listgs[i],listgs[j]
f=self.isAccepted(g1,i,selected) & self.isAccepted(g2,j,selected)
f=self.isAccepted(g1,i,selected)
if f:
inter_g= intersection(g1,g2)
denom=g1.number_of_nodes()+g2.number_of_nodes()+\
......
......@@ -30,7 +30,7 @@ cdef class VertexRanking(Base):
pager_i=list(page_r[i])
for j in range(i,n):
g1,g2=listgs[i],listgs[j]
f=self.isAccepted(g1,i,selected) & self.isAccepted(g2,j,selected)
f=self.isAccepted(g1,i,selected)
pager_j=list(page_r[j])
node_intersection=list(set(pager_i) & set(pager_j))
X,Y=[],[]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment