alex/copycat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds better cross-compare output

Browse Source
This commit is contained in:
LSaldyt
2017-12-04 12:05:07 -07:00
parent 835c43199e
commit 0242456138
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
copycat/statistics.py
View File

@ -1,3 +1,5 @@
from collections import defaultdict
from pprint import pprint
# CHI2 values for n degrees freedom # CHI2 values for n degrees freedom
_chiSquared_table = { _chiSquared_table = {
1:3.841, 1:3.841,
@ -26,7 +28,7 @@ def chi_squared(actual, expected):
E = get_count(k, expected) E = get_count(k, expected)
O = get_count(k, actual) O = get_count(k, actual)
if E == 0: if E == 0:
print('Warning! Expected 0 counts of {}, but got {}'.format(k, O)) print(' Warning! Expected 0 counts of {}, but got {}'.format(k, O))
else: else:
chiSquared += (O - E) ** 2 / E chiSquared += (O - E) ** 2 / E
return degreesFreedom, chiSquared return degreesFreedom, chiSquared
@ -42,15 +44,19 @@ def chi_squared_test(actual, expected, show=True):
return True return True
def cross_formula_chi_squared(actualDict, expectedDict): def cross_formula_chi_squared(actualDict, expectedDict):
failures = []
for ka, actual in actualDict.items(): for ka, actual in actualDict.items():
for ke, expected in expectedDict.items(): for ke, expected in expectedDict.items():
print('Comparing {} with {}: '.format(ka, ke), end='') print(' Comparing {} with {}: '.format(ka, ke), end='')
if not chi_squared_test(actual, expected, show=False): if not chi_squared_test(actual, expected, show=False):
print('Failed.') failures.append('{}:{}'.format(ka, ke))
print(' Failed.')
else: else:
print('Succeeded.') print(' Succeeded.')
return failures
def cross_chi_squared(problemSets): def cross_chi_squared(problemSets):
failures = defaultdict(list)
for i, (a, problemSetA) in enumerate(problemSets): for i, (a, problemSetA) in enumerate(problemSets):
for b, problemSetB in problemSets[i + 1:]: for b, problemSetB in problemSets[i + 1:]:
for problemA in problemSetA: for problemA in problemSetA:
@ -63,11 +69,16 @@ def cross_chi_squared(problemSets):
print('-' * 80) print('-' * 80)
print('\n') print('\n')
print('{} x {}'.format(a, b)) print('{} x {}'.format(a, b))
print('Problem: {}:{}::{}:_'.format(problemA.initial, problemString = '{} x {} for: {}:{}::{}:_\n'.format(a,
b,
problemA.initial,
problemA.modified, problemA.modified,
problemA.target)) problemA.target)
cross_formula_chi_squared(answersA, answersB) failures[problemString].append(cross_formula_chi_squared(answersA, answersB))
pprint(answersA)
pprint(answersB)
print('\n') print('\n')
return failures
def iso_chi_squared(actualDict, expectedDict): def iso_chi_squared(actualDict, expectedDict):
for key in expectedDict.keys(): for key in expectedDict.keys():

4
cross_compare.py
View File

@ -2,6 +2,8 @@
import sys import sys
import pickle import pickle
from pprint import pprint
from copycat import Problem from copycat import Problem
from copycat.statistics import cross_chi_squared from copycat.statistics import cross_chi_squared
@ -16,7 +18,7 @@ def main(args):
pSet = pickle.load(infile) pSet = pickle.load(infile)
branchProblemSets[filename] = pSet branchProblemSets[filename] = pSet
problemSets.append((filename, pSet)) problemSets.append((filename, pSet))
cross_chi_squared(problemSets) pprint(cross_chi_squared(problemSets))
return 0 return 0
if __name__ == '__main__': if __name__ == '__main__':