Finished solve for simulate ensembles (DARPA-ASKEM#130)

src/operations.jl

@@ -297,6 +297,8 @@ function Ensemble{T}(o::OperationRequest) where {T}
     Ensemble{T}(model_ids, operations, weights, sol_mappings, df)
 end
 
+# Solves multiple ODEs, performs a weighted sum
+# of the solutions.
 # Solves multiple ODEs, performs a weighted sum
 # of the solutions.
 function solve(o::Ensemble{Simulate}; callback)
@@ -306,16 +308,16 @@ function solve(o::Ensemble{Simulate}; callback)
     sol = solve(enprob; saveat = 1, callback);
 
     weights = o.weights
-    sol_maps = o.sol_mappings[1]
+    sol_maps = o.sol_mappings
 
     sol_map_states = [state for state in states(systems[1]) if first(values(state.metadata))[2] in Symbol.(values(sol_maps))]
 
     data = [x => vec(sum(stack(weights .* [ind_sol[x] for ind_sol in sol]), dims = 2)) for x in sol_map_states]
 
-    state_symbs = [first(values(pair.first.metadata))[2] for pair in data]
+    state_symbs = [Symbol(pair.first) for pair in data]
     state_data = [dat.second for dat in data]
     dataframable_pairs = [state => data for (state,data) in zip(state_symbs,state_data)]
-    DataFrame(:timestamp => sol[1].t, dataframable_pairs...)
+    DataFrame(:t => sol[1].t, dataframable_pairs...)
 end