change argument interface

- add more properties for network specification
 - change names for consistency
This commit is contained in:
2017-09-07 15:53:58 +02:00
parent 71f218888d
commit 595c2ea894
5 changed files with 42 additions and 24 deletions

View File

@@ -13,7 +13,7 @@ def get_models_by_params(params: dict):
input_length = params.get("input_length")
filter_embedding = params.get("filter_embedding")
kernel_embedding = params.get("kernel_embedding")
hidden_embedding = params.get("hidden_embedding")
hidden_embedding = params.get("dense_embedding")
dropout = params.get("dropout")
# mainly prediction model
flow_features = params.get("flow_features")
@@ -21,7 +21,7 @@ def get_models_by_params(params: dict):
window_size = params.get("window_size")
domain_length = params.get("domain_length")
filter_main = params.get("filter_main")
kernel_main = params.get("kernels_main")
kernel_main = params.get("kernel_main")
dense_dim = params.get("dense_main")
model_output = params.get("model_output", "both")
# create models
@@ -32,12 +32,12 @@ def get_models_by_params(params: dict):
else:
raise Exception("network not found")
embedding_model = networks.get_embedding(embedding_size, input_length, filter_embedding, kernel_embedding,
hidden_embedding, dropout)
hidden_embedding, 0.5)
old_model = networks.get_model(dropout, flow_features, domain_features, window_size, domain_length,
old_model = networks.get_model(0.25, flow_features, domain_features, window_size, domain_length,
filter_main, kernel_main, dense_dim, embedding_model, model_output)
new_model = networks.get_new_model(dropout, flow_features, domain_features, window_size, domain_length,
new_model = networks.get_new_model(0.25, flow_features, domain_features, window_size, domain_length,
filter_main, kernel_main, dense_dim, embedding_model, model_output)
return embedding_model, old_model, new_model