From 73d07212860a440eed1fed724a6cfa02c33fc240 Mon Sep 17 00:00:00 2001 From: LSaldyt Date: Mon, 9 Oct 2017 12:53:54 -0600 Subject: [PATCH] Moves log location --- .gitignore | 1 - copycat/copycat.py | 1 - copycat/temperature.py | 10 +--------- main.py | 2 +- 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index ea7e94f..c6ecab7 100644 --- a/.gitignore +++ b/.gitignore @@ -20,7 +20,6 @@ pip-log.txt .coverage .tox .log -copycat.log # Other filesystems .svn diff --git a/copycat/copycat.py b/copycat/copycat.py index a9a4a1e..2adff4a 100644 --- a/copycat/copycat.py +++ b/copycat/copycat.py @@ -71,7 +71,6 @@ class Copycat(object): #self.temperature.useAdj('original') #self.temperature.useAdj('entropy') self.temperature.useAdj('inverse') # 100 weight - #self.temperature.useAdj('alt_inverse') # 100 weight, equal probs at 100 answers = {} for i in range(iterations): answer = self.runTrial() diff --git a/copycat/temperature.py b/copycat/temperature.py index be2f32f..5457c97 100644 --- a/copycat/temperature.py +++ b/copycat/temperature.py @@ -27,12 +27,6 @@ def _inverse_prob(temp, prob): iprob = 1 - 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): def __init__(self): self.reset() @@ -40,9 +34,7 @@ class Temperature(object): self._adjustmentFormulas = { 'original' : _original, 'entropy' : _entropy, - 'inverse' : _inverse_prob, - 'alt_inverse' : _alt_inverse_prob - } + 'inverse' : _inverse_prob} def reset(self): self.actual_value = 100.0 diff --git a/main.py b/main.py index 3f197ee..23b1033 100755 --- a/main.py +++ b/main.py @@ -49,7 +49,7 @@ class SimpleReporter(Reporter): def main(): """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.add_argument('--seed', type=int, default=None, help='Provide a deterministic seed for the RNG.')