Fixes a small bug in performance.py; fixes tests

msaito8623 · msaito8623 · commit cc81856d8cdb · 2024-09-26T15:11:12.000+02:00
diff --git a/discriminative_lexicon_model/performance.py b/discriminative_lexicon_model/performance.py
@@ -5,7 +5,7 @@
 
 def accuracy (*, pred, gold, method='correlation'):
     pred = predict_df(pred=pred, gold=gold, n=1, method=method)
-    acc = pred.acc.sum() / len(pred)
+    acc = pred.Correct.sum() / len(pred)
     return acc
 
 def predict_df (*, pred, gold, n=1, method='correlation'):
diff --git a/tests/resources/predict_df_00.csv b/tests/resources/predict_df_00.csv
@@ -1,4 +1,4 @@
-Word	pred	acc
+Word	Pred	Correct
 walk0	walk0	True
 walk1	walk0	False
 walks	walks	True
diff --git a/tests/resources/predict_df_01.csv b/tests/resources/predict_df_01.csv
@@ -1,7 +1,7 @@
-Word	pred	acc
-walk0	walk0	True
-walk1	walk0	False
-walks	walks	True
-walked0	walked0	True
-walked1	walked0	False
-walked2	walked0	False
+Word	Pred1	Pred2	Correct1	Correct2
+walk0	walk0	walk1	True	False
+walk1	walk0	walk1	False	True
+walks	walks	walk0	True	False
+walked0	walked0	walked1	True	False
+walked1	walked0	walked1	False	True
+walked2	walked0	walked1	False	False
diff --git a/tests/resources/predict_df_02.csv b/tests/resources/predict_df_02.csv
@@ -1,7 +1,7 @@
-Word	pred1	pred2	acc1	acc2
-walk0	walk0	walks	True	False
-walk1	walk0	walks	False	False
-walks	walks	walk1	True	False
-walked0	walked0	walked2	True	False
-walked1	walked0	walked2	False	False
-walked2	walked0	walked2	False	True
+Word	Pred	Correct
+walk0	walk1	False
+walk1	walk1	True
+walks	walks	True
+walked0	walked2	False
+walked1	walked2	False
+walked2	walked2	True
diff --git a/tests/resources/predict_df_03.csv b/tests/resources/predict_df_03.csv
@@ -1,7 +1,7 @@
-Word	pred1	pred2	acc1	acc2
-walk0	walk0	walk0	True	True
-walk1	walk0	walk0	False	False
-walks	walks	walk1	True	False
-walked0	walked0	walked1	True	False
-walked1	walked0	walked1	False	True
-walked2	walked0	walked1	False	False
+Word	Pred1	Pred2	Correct1	Correct2
+walk0	walk1	walk0	False	True
+walk1	walk1	walk0	True	False
+walks	walks	walked2	True	False
+walked0	walked2	walked0	False	True
+walked1	walked2	walked0	False	False
+walked2	walked2	walked0	True	False
diff --git a/tests/resources/predict_df_04.csv b/tests/resources/predict_df_04.csv
diff --git a/tests/resources/predict_df_05.csv b/tests/resources/predict_df_05.csv
diff --git a/tests/resources/predict_df_06.csv b/tests/resources/predict_df_06.csv
diff --git a/tests/resources/predict_df_07.csv b/tests/resources/predict_df_07.csv
diff --git a/tests/test_ldl.py b/tests/test_ldl.py
@@ -3,9 +3,9 @@
 import os
 import pandas as pd
 from pathlib import Path
-import pyldl.mapping as pm
+import discriminative_lexicon_model.mapping as pm
 import xarray as xr
-from pyldl.ldl import LDL
+from discriminative_lexicon_model.ldl import LDL
 
 TEST_ROOT = Path('.')
 #TEST_ROOT = Path(__file__).parent
diff --git a/tests/test_mapping.py b/tests/test_mapping.py
@@ -3,7 +3,7 @@
 import os
 import pandas as pd
 from pathlib import Path
-import pyldl.mapping as pm
+import discriminative_lexicon_model.mapping as pm
 import xarray as xr
 
 # TEST_ROOT = Path('.')
diff --git a/tests/test_measures.py b/tests/test_measures.py
@@ -3,8 +3,8 @@
 import os
 import pandas as pd
 from pathlib import Path
-import pyldl.mapping as pm
-import pyldl.measures as lmea
+import discriminative_lexicon_model.mapping as pm
+import discriminative_lexicon_model.measures as lmea
 import xarray as xr
 
 TEST_ROOT = Path(__file__).parent
diff --git a/tests/test_performance.py b/tests/test_performance.py
@@ -3,8 +3,8 @@
 import os
 import pandas as pd
 from pathlib import Path
-import pyldl.mapping as pm
-import pyldl.performance as lper
+import discriminative_lexicon_model.mapping as pm
+import discriminative_lexicon_model.performance as lper
 import xarray as xr
 
 TEST_ROOT = Path(__file__).parent
@@ -29,37 +29,22 @@ def expand_to_mats (x):
     return ret
 
 mats = ['c', 's']
-dist = [True, False]
-pars = [ (i,j) for i in mats for j in dist ]
-pars = [ tuple(expand_to_mats(i[0]) + [i[1]]) for i in pars ]
-@pytest.mark.parametrize('hat, mat, dist', pars)
-def test_accuracy (hat, mat, dist):
-    assert lper.accuracy(hat, mat, dist) == 0.5
+pars = [ tuple(expand_to_mats(i[0])) for i in mats ]
+@pytest.mark.parametrize('hat, mat', pars)
+def test_accuracy (hat, mat):
+    assert lper.accuracy(pred=hat, gold=mat) == 0.5
 
 
 mats = ['c', 's']
 gues = [1, 2]
-dist = [True, False]
-pars = [ [i,j,k] for i in mats for j in gues for k in dist ]
+pars = [ [i,j] for i in mats for j in gues ]
 pars = [ tuple(expand_to_mats(i[0]) + i[1:]) for i in pars ]
 pars = [ [i,*j] for i,j in enumerate(pars) ]
-@pytest.mark.parametrize('ind, hat, mat, gues, dist', pars)
-def test_accuracy (ind, hat, mat, gues, dist):
-    pred = lper.predict_df(hat, mat, gues, dist)
+@pytest.mark.parametrize('ind, hat, mat, gues', pars)
+def test_accuracy_df (ind, hat, mat, gues):
+    pred = lper.predict_df(pred=hat, gold=mat, n=gues)
     _prd = '{}/predict_df_{:02d}.csv'.format(RESOURCES, ind)
     _prd = pd.read_csv(_prd, sep='\t', header=0)
     assert pred.equals(_prd)
 
 
-wrds = ['walk0', 'walks']
-mats = ['c', 's']
-dist = [True, False]
-pars = [ [i,j,k] for i in wrds for j in mats for k in dist ]
-pars = [ [i[0]] + expand_to_mats(i[1]) + i[2:] for i in pars ]
-pars = [ [i,*j] for i,j in enumerate(pars) ]
-@pytest.mark.parametrize('ind, wrd, hat, mat, dist', pars)
-def test_predict (ind, wrd, hat, mat, dist):
-    pred = lper.predict(wrd, hat, mat, dist)
-    _prd = '{}/predict_{:02d}.csv'.format(RESOURCES, ind)
-    _prd = pd.read_csv(_prd, sep='\t', header=None).squeeze('columns')
-    assert pred.equals(_prd)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Word pred acc`
	`1`	`+Word Pred Correct`
`2`	`2`	`walk0 walk0 True`
`3`	`3`	`walk1 walk0 False`
`4`	`4`	`walks walks True`