# HG changeset patch # User blanchet # Date 1354641830 -3600 # Node ID fb48de1f39ba1b48c44c7b235fcff5c425da355c # Parent 136d5318b1fef2dbfd5a0f5353bb0ed17b765351 fixed bug in initialization of naive Bayes (MaSh) diff -r 136d5318b1fe -r fb48de1f39ba src/HOL/Tools/Sledgehammer/MaSh/src/naiveBayes.py --- a/src/HOL/Tools/Sledgehammer/MaSh/src/naiveBayes.py Tue Dec 04 18:12:30 2012 +0100 +++ b/src/HOL/Tools/Sledgehammer/MaSh/src/naiveBayes.py Tue Dec 04 18:23:50 2012 +0100 @@ -16,7 +16,7 @@ class NBClassifier(object): ''' - An updatable naive Bayes classifier. + An updateable naive Bayes classifier. ''' def __init__(self): @@ -35,7 +35,9 @@ self.counts[d] = [dPosCount,dFeatureCounts] for key in dicts.dependenciesDict.keys(): - keyDeps = dicts.dependenciesDict[key] + # Add p proves p + keyDeps = [key]+dicts.dependenciesDict[key] + for dep in keyDeps: self.counts[dep][0] += 1 depFeatures = dicts.featureDict[key] @@ -103,10 +105,11 @@ else: resultA -= 15 predictions.append(resultA) - expPredictions = array([exp(x) for x in predictions]) + #expPredictions = array([exp(x) for x in predictions]) predictions = array(predictions) perm = (-predictions).argsort() - return array(accessibles)[perm],expPredictions[perm] + #return array(accessibles)[perm],expPredictions[perm] + return array(accessibles)[perm],predictions[perm] def save(self,fileName): OStream = open(fileName, 'wb')