Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions medcat-v2/medcat/components/addons/meta_cat/data_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -315,10 +315,9 @@ def undersample_data(data: list, category_value2id: dict, label_data_,
label_data_counter[sample[-1]] += 1

label_data = {v: 0 for v in category_value2id.values()}
for i in range(len(data_undersampled)):
if data_undersampled[i][2] in category_value2id.values():
label_data[data_undersampled[i][2]] = (
label_data[data_undersampled[i][2]] + 1)
for sample in data_undersampled:
if sample[2] in label_data:
label_data[sample[2]] += 1
logger.info("Updated number of samples per label (for 2-phase learning):"
" %s", label_data)
return data_undersampled
Expand Down Expand Up @@ -410,9 +409,9 @@ def encode_category_values(data: list[tuple[list, list, str]],

# Creating dict with labels and its number of samples
label_data_ = {v: 0 for v in category_value2id.values()}
for i in range(len(data)):
if data[i][2] in category_value2id.values():
label_data_[data[i][2]] = label_data_[data[i][2]] + 1
for sample in data:
if sample[2] in label_data_:
label_data_[sample[2]] += 1

logger.info("Original number of samples per label: %s", label_data_)

Expand Down
15 changes: 8 additions & 7 deletions medcat-v2/medcat/components/addons/meta_cat/ml_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,15 @@ def create_batch_piped_data(data: list[tuple[list[int], int, Optional[int]]],
y (Optional[torch.Tensor]):
class label of the data
"""
max_seq_len = max([len(x[0]) for x in data])
batch = data[start_ind:end_ind]
max_seq_len = max(len(x[0]) for x in batch)
x = [x[0][0:max_seq_len] + [pad_id] * max(0, max_seq_len - len(x[0]))
for x in data[start_ind:end_ind]]
cpos = [x[1] for x in data[start_ind:end_ind]]
for x in batch]
cpos = [x[1] for x in batch]
y = None
if len(data[0]) == 3:
# Means we have the y column
y = torch.tensor([x[2] for x in data[start_ind:end_ind]],
y = torch.tensor([x[2] for x in batch],
dtype=torch.long).to(device)

x2 = torch.tensor(x, dtype=torch.long).to(device)
Expand Down Expand Up @@ -511,10 +512,10 @@ def _eval_predictions(
info = "Predicted: {}, True: {}".format(pred, y)
if pred != y:
# We made a mistake
examples['FN'][y] = examples['FN'].get(y, []) + [(info, text)]
examples['FP'][pred] = examples['FP'].get(pred, []) + [(info, text)]
examples['FN'].setdefault(y, []).append((info, text))
examples['FP'].setdefault(pred, []).append((info, text))
else:
examples['TP'][y] = examples['TP'].get(y, []) + [(info, text)]
examples['TP'].setdefault(y, []).append((info, text))

return {'precision': precision, 'recall': recall, 'f1': f1,
'examples': examples, 'confusion matrix': confusion}
7 changes: 3 additions & 4 deletions medcat-v2/medcat/components/linking/vector_context_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -231,10 +231,9 @@ def _preprocess_disamb_similarities(self, entity: MutableEntity,
pref_freq = self.config.prefer_frequent_concepts
scales = [np.log10(cnt / m) * pref_freq if cnt > 10 else 0
for cnt in cnts]
old_sims = list(similarities)
similarities.clear()
similarities += [float(min(0.99, sim + sim * scale))
for sim, scale in zip(old_sims, scales)]
for i, scale in enumerate(scales):
similarities[i] = float(min(0.99,
similarities[i] + similarities[i] * scale))

def get_all_similarities(self, cuis: list[str], entity: MutableEntity,
name: str, doc: MutableDocument,
Expand Down
Loading