Commit 8a294673 authored by delanoe's avatar delanoe

[FIX] undone changes.

parent 04706a8a
from collections import defaultdict from collections import defaultdict
from math import sqrt from math import sqrt
from gargantext_web.db import session, NodeNgram, NodeNgramNgram, NodeHyperdataNgram, bulk_insert from gargantext_web.db import session, NodeNgram, NodeNgramNgram, bulk_insert
class BaseClass: class BaseClass:
...@@ -134,21 +134,10 @@ class WeightedMatrix(BaseClass): ...@@ -134,21 +134,10 @@ class WeightedMatrix(BaseClass):
if other is None: if other is None:
self.items = defaultdict(lambda: defaultdict(float)) self.items = defaultdict(lambda: defaultdict(float))
elif isinstance(other, int): elif isinstance(other, int):
self.hyperdata = session.query(Node.hyperdata).filter(Node.id==other)
self.hyperdata['field1'] = self.hyperdata.get('field1', 'ngrams')
self.hyperdata['field2'] = self.hyperdata.get('field2', 'ngrams')
if self.hyperdata['field1'] == self.hyperdata['field2'] == 'ngrams':
query = (session query = (session
.query(NodeNgramNgram.ngramx_id, NodeNgramNgram.ngramy_id, NodeNgramNgram.score) .query(NodeNgramNgram.ngramx_id, NodeNgramNgram.ngramy_id, NodeNgramNgram.score)
.filter(NodeNgramNgram.node_id == other) .filter(NodeNgramNgram.node_id == other)
) )
else:
query = (session
.query(NodeHyperdataNgram.hyperdata_id, NodeHyperdataNgram.ngram_id, NodeHyperdataNgram.score)
.filter(NodeHyperdataNgram.node_id == other)
)
self.items = defaultdict(lambda: defaultdict(float)) self.items = defaultdict(lambda: defaultdict(float))
for key1, key2, value in self.items.items(): for key1, key2, value in self.items.items():
self.items[key1][key2] = value self.items[key1][key2] = value
...@@ -170,7 +159,6 @@ class WeightedMatrix(BaseClass): ...@@ -170,7 +159,6 @@ class WeightedMatrix(BaseClass):
def save(self, node_id): def save(self, node_id):
# delete previous data # delete previous data
if self.hyperdata['field1'] == self.hyperdata['field2'] == 'ngrams':
session.query(NodeNgramNgram).filter(NodeNgramNgram.node_id == node_id).delete() session.query(NodeNgramNgram).filter(NodeNgramNgram.node_id == node_id).delete()
session.commit() session.commit()
# insert new data # insert new data
...@@ -179,15 +167,6 @@ class WeightedMatrix(BaseClass): ...@@ -179,15 +167,6 @@ class WeightedMatrix(BaseClass):
('node_id', 'ngramx_id', 'ngramy_id', 'score'), ('node_id', 'ngramx_id', 'ngramy_id', 'score'),
((node_id, key1, key2, value) for key1, key2, value in self) ((node_id, key1, key2, value) for key1, key2, value in self)
) )
else:
session.query(NodeHyperdataNgram).filter(NodeHyperdataNgram.node_id == node_id).delete()
session.commit()
bulk_insert(
NodeHyperdataNgram,
('node_id', 'hyperdata_id', 'ngram_id', 'score'),
((node_id, key1, key2, value) for key1, key2, value in self)
)
def __radd__(self, other): def __radd__(self, other):
result = NotImplemented result = NotImplemented
......
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