Moves log location

This commit is contained in:
LSaldyt
2017-10-09 12:53:54 -06:00
parent 27a55668be
commit 73d0721286
4 changed files with 2 additions and 12 deletions

1
.gitignore vendored
View File

@ -20,7 +20,6 @@ pip-log.txt
.coverage .coverage
.tox .tox
.log .log
copycat.log
# Other filesystems # Other filesystems
.svn .svn

View File

@ -71,7 +71,6 @@ class Copycat(object):
#self.temperature.useAdj('original') #self.temperature.useAdj('original')
#self.temperature.useAdj('entropy') #self.temperature.useAdj('entropy')
self.temperature.useAdj('inverse') # 100 weight self.temperature.useAdj('inverse') # 100 weight
#self.temperature.useAdj('alt_inverse') # 100 weight, equal probs at 100
answers = {} answers = {}
for i in range(iterations): for i in range(iterations):
answer = self.runTrial() answer = self.runTrial()

View File

@ -27,12 +27,6 @@ def _inverse_prob(temp, prob):
iprob = 1 - prob iprob = 1 - prob
return (temp / 100) * iprob + ((100 - temp) / 100) * prob return (temp / 100) * iprob + ((100 - temp) / 100) * prob
def _alt_inverse_prob(temp, prob):
if temp == 100:
return .5
iprob = 1 - prob
return (temp / 100) * iprob + ((100 - temp) / 100) * prob
class Temperature(object): class Temperature(object):
def __init__(self): def __init__(self):
self.reset() self.reset()
@ -40,9 +34,7 @@ class Temperature(object):
self._adjustmentFormulas = { self._adjustmentFormulas = {
'original' : _original, 'original' : _original,
'entropy' : _entropy, 'entropy' : _entropy,
'inverse' : _inverse_prob, 'inverse' : _inverse_prob}
'alt_inverse' : _alt_inverse_prob
}
def reset(self): def reset(self):
self.actual_value = 100.0 self.actual_value = 100.0

View File

@ -49,7 +49,7 @@ class SimpleReporter(Reporter):
def main(): def main():
"""Program's main entrance point. Self-explanatory code.""" """Program's main entrance point. Self-explanatory code."""
logging.basicConfig(level=logging.INFO, format='%(message)s', filename='./copycat.log', filemode='w') logging.basicConfig(level=logging.INFO, format='%(message)s', filename='./output/copycat.log', filemode='w')
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument('--seed', type=int, default=None, help='Provide a deterministic seed for the RNG.') parser.add_argument('--seed', type=int, default=None, help='Provide a deterministic seed for the RNG.')