Skip to content

Commit 5fbb13c

Browse files
committed
bugfix related with executionStrategy
1 parent 88a1e2c commit 5fbb13c

File tree

2 files changed

+22
-10
lines changed

2 files changed

+22
-10
lines changed

Backend/tests/analysis.py

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,25 @@ def iterate_anova_tables(aov_table, aov_table_sqr):
6262
dd[row.Index][col_name] = getattr(row, col_name)
6363
return dd
6464

65-
def get_influence_parameters(anova_result, nrOfParameters):
66-
print(anova_result)
67-
print(type(anova_result))
65+
def get_influence_parameters(anova_result, alpha, nrOfParameters):
66+
67+
print "##########"
68+
import pprint
69+
pp = pprint.PrettyPrinter(indent=4)
70+
pp.pprint(anova_result)
71+
print "##########"
72+
# now we want to select the most important factors out of anova result
73+
74+
significant_interactions = []
75+
for interaction_key in anova_result.keys():
76+
pvalue = anova_result[interaction_key]['PR(>F)']
77+
if pvalue < alpha:
78+
significant_interactions.append((interaction_key, pvalue))
79+
80+
sorted_significant_interactions = sorted((value, key) for (key, value) in significant_interactions)
81+
print "!!!!!!!!!"
82+
pp.pprint(sorted_significant_interactions)
83+
print "!!!!!!!!!"
6884
return anova_result
6985

7086
if __name__ == '__main__':
@@ -73,5 +89,6 @@ def get_influence_parameters(anova_result, nrOfParameters):
7389
id = "a780bba9-a2c7-20a5-7be9-ede26d9c9b64"
7490
stage_ids = ["6dc62e9c-3625-85ca-657e-3b06cc269828#1", "6dc62e9c-3625-85ca-657e-3b06cc269828#2", "6dc62e9c-3625-85ca-657e-3b06cc269828#3", "6dc62e9c-3625-85ca-657e-3b06cc269828#4"]
7591
retrieved = db().get_analysis(experiment_id=id, stage_ids=stage_ids, analysis_name="two-way-anova")
76-
nrOfParameters = 2 # to be retrieved from experiment definition
77-
get_influence_parameters(retrieved["anova_result"], nrOfParameters)
92+
nrOfParameters = 2 # to be retrieved from analysis definition
93+
alpha = 0.5 # to be retrieved from analysis definition
94+
get_influence_parameters(retrieved["anova_result"], alpha, nrOfParameters)

Frontend/src/app/+control/experiments/create/create-experiments.component.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -168,11 +168,6 @@ export class CreateExperimentsComponent implements OnInit {
168168

169169
// User can select execution strategy while creating an experiment
170170
public executionStrategyModelChanged(execution_strategy_key) {
171-
172-
// refresh previously-selected variables of targetSystem & experiment
173-
this.experiment.changeableVariables = _(this.originalExperiment.changeableVariables);
174-
this.targetSystem.changeableVariables = _(this.originalTargetSystem.changeableVariables);
175-
176171
this.experiment.executionStrategy.type = execution_strategy_key;
177172
if (execution_strategy_key === 'mlr_mbo') {
178173
this.acquisitionMethodChanged("ei");

0 commit comments

Comments
 (0)