display model fit error

mrc-ide · Nov 5, 2023 · 6a95fa0 · 6a95fa0
1 parent 994eb8b
commit 6a95fa0
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 24 deletions.
diff --git a/app/static/src/app/components/fit/FitTab.vue b/app/static/src/app/components/fit/FitTab.vue
@@ -21,6 +21,7 @@
           <div v-if="cancelled" id="fit-cancelled-msg" class="small text-danger">{{cancelledMsg}}</div>
         </div>
       </fit-plot>
+      <error-info :error="error"></error-info>
     </div>
   </div>
 </template>
@@ -39,10 +40,12 @@ import { ModelFitMutation } from "../../store/modelFit/mutations";
 import { fitRequirementsExplanation, fitUpdateRequiredExplanation } from "./support";
 import { allTrue, anyTrue } from "../../utils";
 import LoadingButton from "../LoadingButton.vue";
+import ErrorInfo from "@/app/components/ErrorInfo.vue";
 
 export default defineComponent({
     name: "FitTab",
     components: {
+      ErrorInfo,
         LoadingSpinner,
         FitPlot,
         ActionRequiredMessage,
@@ -57,6 +60,7 @@ export default defineComponent({
         const canFitModel = computed(() => allTrue(fitRequirements.value));
         const compileRequired = computed(() => store.state.model.compileRequired);
         const fitUpdateRequired = computed(() => store.state.modelFit.fitUpdateRequired);
+        const error = computed(() => store.state.modelFit.error);
         const fitModel = () => store.dispatch(`${namespace}/${ModelFitAction.FitModel}`);
 
         const cancelFit = () => store.commit(`${namespace}/${ModelFitMutation.SetFitting}`, false);
@@ -68,6 +72,10 @@ export default defineComponent({
         const sumOfSquares = computed(() => store.state.modelFit.sumOfSquares);
 
         const actionRequiredMessage = computed(() => {
+            if (error.value) {
+              return userMessages.modelFit.errorOccurred;
+            }
+
             if (!allTrue(fitRequirements.value)) {
                 return fitRequirementsExplanation(fitRequirements.value);
             }
@@ -119,6 +127,7 @@ export default defineComponent({
             cancelledMsg,
             sumOfSquares,
             actionRequiredMessage,
+            error,
             iconType,
             iconClass
         };

diff --git a/app/static/src/app/serialise.ts b/app/static/src/app/serialise.ts
@@ -130,7 +130,8 @@ function serialiseModelFit(modelFit: ModelFitState): SerialisedModelFitState {
         converged: modelFit.converged,
         sumOfSquares: modelFit.sumOfSquares,
         paramsToVary: modelFit.paramsToVary,
-        result: serialiseSolutionResult(modelFit.result)
+        result: serialiseSolutionResult(modelFit.result),
+        error: modelFit.error
     };
 }
 

diff --git a/app/static/src/app/store/appState/mutations.ts b/app/static/src/app/store/appState/mutations.ts
@@ -21,7 +21,8 @@ export enum AppStateMutation {
 export const StateUploadMutations = [
     AppStateMutation.ClearQueuedStateUpload,
     AppStateMutation.SetQueuedStateUpload,
-    AppStateMutation.SetStateUploadInProgress
+    AppStateMutation.SetStateUploadInProgress,
+    AppStateMutation.SetPersisted
 ] as string[];
 
 export const appStateMutations: MutationTree<AppState> = {

diff --git a/app/static/src/app/store/modelFit/actions.ts b/app/static/src/app/store/modelFit/actions.ts
@@ -50,24 +50,28 @@ export const actions: ActionTree<ModelFitState, FitState> = {
             const { advancedSettings } = rootState.run;
             const advancedSettingsOdin = convertAdvancedSettingsToOdin(advancedSettings, pars.base);
 
-            const simplex = odinRunnerOde!.wodinFit(
-                odin!,
-                data,
-                pars,
-                linkedVariable,
-                advancedSettingsOdin,
-                {}
-            );
-
-            const inputs = {
-                data,
-                endTime,
-                link
-            };
-
-            commit(ModelFitMutation.SetFitUpdateRequired, null);
-            commit(ModelFitMutation.SetInputs, inputs);
-            dispatch(ModelFitAction.FitModelStep, simplex);
+            try {
+                const simplex = odinRunnerOde!.wodinFit(
+                    odin!,
+                    data,
+                    pars,
+                    linkedVariable,
+                    advancedSettingsOdin,
+                    {}
+                );
+
+                const inputs = {
+                    data,
+                    endTime,
+                    link
+                };
+                commit(ModelFitMutation.SetFitUpdateRequired, null);
+                commit(ModelFitMutation.SetInputs, inputs);
+                dispatch(ModelFitAction.FitModelStep, simplex);
+            } catch (e: unknown) {
+                commit(ModelFitMutation.SetError, {error: "Model fit error", detail: (e as Error).message});
+                commit(ModelFitMutation.SetFitting, false);
+            }
         }
     },
 

diff --git a/app/static/src/app/store/modelFit/modelFit.ts b/app/static/src/app/store/modelFit/modelFit.ts
@@ -18,7 +18,8 @@ export const defaultState: ModelFitState = {
     sumOfSquares: null,
     paramsToVary: [],
     inputs: null,
-    result: null
+    result: null,
+    error: null
 };
 
 export const modelFit = {

diff --git a/app/static/src/app/store/modelFit/mutations.ts b/app/static/src/app/store/modelFit/mutations.ts
@@ -1,19 +1,23 @@
 import { MutationTree } from "vuex";
 import { ModelFitInputs, ModelFitState, FitUpdateRequiredReasons } from "./state";
-import { SimplexResult } from "../../types/responseTypes";
+import {SimplexResult, WodinError} from "../../types/responseTypes";
 
 export enum ModelFitMutation {
     SetFitting = "SetFitting",
     SetResult = "SetResult",
     SetInputs = "SetInputs",
     SetParamsToVary = "SetParamsToVary",
     SetSumOfSquares = "SetSumOfSquares",
-    SetFitUpdateRequired = "SetFitUpdateRequired"
+    SetFitUpdateRequired = "SetFitUpdateRequired",
+    SetError = "SetError"
 }
 
 export const mutations: MutationTree<ModelFitState> = {
     [ModelFitMutation.SetFitting](state: ModelFitState, payload: boolean) {
         state.fitting = payload;
+        if (payload) {
+            state.error = null
+        }
     },
 
     [ModelFitMutation.SetResult](state: ModelFitState, payload: SimplexResult) {
@@ -43,6 +47,10 @@ export const mutations: MutationTree<ModelFitState> = {
         state.sumOfSquares = payload;
     },
 
+    [ModelFitMutation.SetError](state: ModelFitState, payload: WodinError) {
+        state.error = payload;
+    },
+
     [ModelFitMutation.SetFitUpdateRequired](state: ModelFitState, payload: null | Partial<FitUpdateRequiredReasons>) {
         if (payload === null) {
             state.fitUpdateRequired = {

diff --git a/app/static/src/app/store/modelFit/state.ts b/app/static/src/app/store/modelFit/state.ts
@@ -1,5 +1,6 @@
 import { OdinFitResult } from "../../types/wrapperTypes";
 import type { FitData, FitDataLink } from "../fitData/state";
+import {WodinError} from "../../types/responseTypes";
 
 export interface ModelFitInputs {
     data: FitData;
@@ -25,6 +26,7 @@ export interface ModelFitState {
     paramsToVary: string[],
     inputs: ModelFitInputs | null, // all inputs except parameters, which vary
     result: OdinFitResult | null, // full solution for current best fit,
+    error: null | WodinError
 }
 
 export interface ModelFitRequirements {

diff --git a/app/static/src/app/types/serialisationTypes.ts b/app/static/src/app/types/serialisationTypes.ts
@@ -77,7 +77,8 @@ export interface SerialisedModelFitState {
     converged: boolean | null,
     sumOfSquares: number | null,
     paramsToVary: string[],
-    result: SerialisedRunResult | null
+    result: SerialisedRunResult | null,
+    error: null | WodinError
 }
 
 export interface SerialisedAppState {

diff --git a/app/static/src/app/userMessages.ts b/app/static/src/app/userMessages.ts
@@ -56,6 +56,7 @@ export default {
         notFittedYet: "Model has not been fitted.",
         selectParamToVary: "Please select at least one parameter to vary during model fit.",
         compileRequired: "Model code has been updated. Compile code and Fit Model for updated best fit.",
+        errorOccurred: "An error occurred during model fit.",
         updateFitReasons: {
             prefix: "Fit is out of date:",
             unknown: "unknown reasons, contact the administrator, as this is unexpected",