x/terracotta
Code Issues Proposed changes

MHOD: moved the p estimation to the end, need to fix the tests

Browse Source
This commit is contained in:
Anton Beloglazov 2012-12-18 17:39:21 +11:00
parent 93bc20bb1c
commit 321080a89d
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
neat/locals/overload/mhod/core.py
View File

@ -133,19 +133,19 @@ def mhod(state_config, otf, window_sizes, bruteforce_step, learning_steps,
state['acceptable_variances'] = estimation.init_variances(
window_sizes, number_of_states)
n = len(utilization)
#n = len(utilization)
for i, current_state in enumerate(utilization_to_states(state_config, utilization)):
if i == n - 1:
selected_windows = estimation.select_window(
state['variances'],
state['acceptable_variances'],
window_sizes)
p = estimation.select_best_estimates(
state['estimate_windows'],
selected_windows)
# These two are saved for testing purposes
state['selected_windows'] = selected_windows
state['p'] = p
# if i == n - 1:
# selected_windows = estimation.select_window(
# state['variances'],
# state['acceptable_variances'],
# window_sizes)
# p = estimation.select_best_estimates(
# state['estimate_windows'],
# selected_windows)
# # These two are saved for testing purposes
# state['selected_windows'] = selected_windows
# state['p'] = p
state['request_windows'] = estimation.update_request_windows(
state['request_windows'],
@ -165,6 +165,17 @@ def mhod(state_config, otf, window_sizes, bruteforce_step, learning_steps,
previous_state)
previous_state = current_state
selected_windows = estimation.select_window(
state['variances'],
state['acceptable_variances'],
window_sizes)
p = estimation.select_best_estimates(
state['estimate_windows'],
selected_windows)
# These two are saved for testing purposes
state['selected_windows'] = selected_windows
state['p'] = p
state_vector = build_state_vector(state_config, utilization)
current_state = get_current_state(state_vector)
state['state_history'].append(current_state)