Skip to content
Snippets Groups Projects
Commit dfe6f88f authored by Tim O'Donnell's avatar Tim O'Donnell
Browse files

fix

parent 9d8c9efa
No related merge requests found
...@@ -233,7 +233,8 @@ class PresentationComponentModel(object): ...@@ -233,7 +233,8 @@ class PresentationComponentModel(object):
return_value = result_df[columns] return_value = result_df[columns]
if self.cached_predictions is not None: if self.cached_predictions is not None:
self.cached_predictions[cache_key] = return_value self.cached_predictions[cache_key] = return_value
return return_value return dict(
(col, return_value[col].values) for col in self.column_names())
def clone(self): def clone(self):
""" """
......
...@@ -188,7 +188,7 @@ class PresentationModel(object): ...@@ -188,7 +188,7 @@ class PresentationModel(object):
model_input_training_hits_df) model_input_training_hits_df)
self.trained_component_models[-1].append((sub_model,)) self.trained_component_models[-1].append((sub_model,))
predictions = sub_model.predict(hits_and_decoys_df) predictions = sub_model.predict(hits_and_decoys_df)
for (col, values) in predictions.iteritems(): for (col, values) in predictions.items():
hits_and_decoys_df[col] = values hits_and_decoys_df[col] = values
final_predictor = self.fit_final_predictor(hits_and_decoys_df) final_predictor = self.fit_final_predictor(hits_and_decoys_df)
self.presentation_models_predictors.append(final_predictor) self.presentation_models_predictors.append(final_predictor)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment