From 45b2d050839cdbe4bf568e243832e324f63a8c9c Mon Sep 17 00:00:00 2001 From: Kevin Brubeck Unhammer Date: Thu, 18 Sep 2008 12:15:21 +0200 Subject: [PATCH] another little fix to stop initialization --- report/report.pdf | Bin 129004 -> 129025 bytes report/report.tex | 2 +- src/main.py | 8 ++++---- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/report/report.pdf b/report/report.pdf index 44b69111d88234dd14864a3b9d1aed97cf562f7c..004465e7b9c37dd8b1d3a03c598620860fc413f3 100644 GIT binary patch delta 4801 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 diff --git a/report/report.tex b/report/report.tex index df06de3..44fced8 100644 --- a/report/report.tex +++ b/report/report.tex @@ -383,7 +383,7 @@ border\footnote{For non-adjacent stopping we checked for occurence at \begin{align*} P_{STOP}(stop|h,left,adj) = \frac {C_{M} + \sum_{s \in S}\sum_{\LOC{h} \in s} f(stop:\LOC{h},left,adj)} - {C_{M} + \sum_{s \in S}\sum_{\LOC{h} \in s} C_N} + {C_{M} + \sum_{s \in S}\sum_{\LOC{h} \in s} C_S+C_N} \end{align*} \subsection{TODO: Results} diff --git a/src/main.py b/src/main.py index b5b6336..94c490f 100644 --- a/src/main.py +++ b/src/main.py @@ -15,10 +15,10 @@ def initialize_loc_h(tagonlys): # loc_h_harmonic.HARMONIC_C = 380.111684914 # loc_h_harmonic.FSTOP_MIN = 13.5744632704 # loc_h_harmonic.FNONSTOP_MIN = 34.8939452454 - loc_h_harmonic.HARMONIC_C = random.random() # 0.0 # 509.63 #1000.0 * random.random() - loc_h_harmonic.FSTOP_MIN = random.random() # 1.0 # 13.08 #20.0 * random.random() - loc_h_harmonic.STOP_C = random.random() - loc_h_harmonic.NSTOP_C = random.random() + loc_h_harmonic.HARMONIC_C = 0.0 # random.random() # 509.63 + loc_h_harmonic.FSTOP_MIN = 1.0 # random.random() # 13.08 + loc_h_harmonic.STOP_C = 1.0 # random.random() + loc_h_harmonic.NSTOP_C = 1.0 # random.random() loc_h_harmonic.RIGHT_FIRST = 1.0 loc_h_harmonic.OLD_STOP_CALC = False -- 2.11.4.GIT