From 1ae45f8b9f32ba7384b349bc42d8eccb12be5973 Mon Sep 17 00:00:00 2001
From: Alex Moreo <alejandro.moreo@isti.cnr.it>
Date: Thu, 18 Nov 2021 16:57:50 +0100
Subject: [PATCH] doing tests with quantification stumps

---
 NewMethods/class_weight_model.py                         | 3 ++-
 NewMethods/{tc_experiments.py => reviews_experiments.py} | 6 +++---
 NewMethods/{tc_tables.py => reviews_tables.py}           | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)
 rename NewMethods/{tc_experiments.py => reviews_experiments.py} (97%)
 rename NewMethods/{tc_tables.py => reviews_tables.py} (97%)

diff --git a/NewMethods/class_weight_model.py b/NewMethods/class_weight_model.py
index b8b7c29..3f989ff 100644
--- a/NewMethods/class_weight_model.py
+++ b/NewMethods/class_weight_model.py
@@ -28,7 +28,8 @@ Possible extensions:
     - better investigate the "iterative" nature of the method.
     - better investigate the implications with other learners. E.g., using EMQ as a prompt, or using EMQ in the second
         stage (test).
-    - test with SVM
+    - test with SVM (not working well... and problematic due to the fact that svms need to be calibrated)
+    - test in multiclass scenarios
 """
 
 class ClassWeightPCC(BaseQuantifier):
diff --git a/NewMethods/tc_experiments.py b/NewMethods/reviews_experiments.py
similarity index 97%
rename from NewMethods/tc_experiments.py
rename to NewMethods/reviews_experiments.py
index b38a6df..66e822e 100644
--- a/NewMethods/tc_experiments.py
+++ b/NewMethods/reviews_experiments.py
@@ -42,7 +42,7 @@ def quantification_models():
     # yield 'pcc.opt', PCC(newLR()), lr_params
     # yield 'pacc.opt', PACC(newLR()), lr_params
     # yield 'wpacc.opt', ClassWeightPCC(), lr_params
-    yield 'ds', QuantificationStumpRegressor(SAMPLE_SIZE), None
+    yield 'ds', QuantificationStumpRegressor(SAMPLE_SIZE, 21, 10), None
     # yield 'ds.opt', QuantificationStumpRegressor(SAMPLE_SIZE), {'C': __C_range}
     # yield 'MAX', MAX(newLR()), lr_params
     # yield 'MS', MS(newLR()), lr_params
@@ -130,8 +130,8 @@ def run(experiment):
         model,
         test=data.test,
         sample_size=SAMPLE_SIZE,
-        n_prevpoints=21,
-        n_repetitions=1,
+        n_prevpoints=21,  # 21
+        n_repetitions=10,  # 100
         n_jobs=-1 if isinstance(model, qp.method.meta.Ensemble) else 1,
         verbose=True
     )
diff --git a/NewMethods/tc_tables.py b/NewMethods/reviews_tables.py
similarity index 97%
rename from NewMethods/tc_tables.py
rename to NewMethods/reviews_tables.py
index 3aa7ea0..ab13e85 100644
--- a/NewMethods/tc_tables.py
+++ b/NewMethods/reviews_tables.py
@@ -5,7 +5,7 @@ import sys, os
 import pickle
 import argparse
 from common import *
-from tc_experiments import *
+from reviews_experiments import *
 from tabular import Table
 import itertools