RsBundle  Diff

Differences From Artifact [af6d30940a]:

  • File src/solver/sync.rs — part of check-in [9ab8935531] at 2022-06-15 16:01:38 on branch solver-state — Use the `Saveable` trait for master problems and solvers (user: fifr size: 32920)

To Artifact [7d2a7a5159]:

  • File src/solver/sync.rs — part of check-in [264ce5184e] at 2022-06-15 16:22:58 on branch solver-state — Improve error handling of `Saveable` implementors (user: fifr size: 33106)

905
906
907
908
909
910
911
912

913
914

915
916

917
918

919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935




936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951

952
953
954

955
956
957
958
959
960
961
905
906
907
908
909
910
911

912
913

914
915

916
917

918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934

935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953

954
955
956

957
958
959
960
961
962
963
964







-
+

-
+

-
+

-
+
















-
+
+
+
+















-
+


-
+







    cnt_evals: usize,
    weighter_state: W,
    master_state: Option<MasterProcessState<M>>,
}

#[derive(Debug, Error)]
#[non_exhaustive]
pub enum SolverStateError {
pub enum SolverStateError<MErr, SErr> {
    #[error("Master problem creation failed")]
    BuildMaster,
    BuildMaster(#[source] MErr),
    #[error("Restoring the master state failed")]
    RestoreMasterState,
    RestoreMasterState(#[source] SErr),
    #[error("Getting the master state failed")]
    GetMasterState,
    GetMasterState(#[source] SErr),
    #[error("Restoring the weighter state failed")]
    RestoreWeighterState,
    #[error("Getting the weighter state failed")]
    GetWeighterState,
}

impl<P, T, W, M> Saveable for Solver<P, T, W, M>
where
    P: FirstOrderProblem,
    T: Terminator<SolverData> + Default,
    W: Weighter<SolverData> + Saveable + Default,
    M: MasterBuilder<P::Minorant>,
    M::MasterProblem: Saveable,
{
    type State = SyncSolverState<W::State, <M::MasterProblem as Saveable>::State>;

    type Err = SolverStateError;
    type Err = SolverStateError<
        <M::MasterProblem as MasterProblem<<P as FirstOrderProblem>::Minorant>>::Err,
        <M::MasterProblem as Saveable>::Err,
    >;

    fn set_state(&mut self, state: Self::State) -> std::result::Result<(), Self::Err> {
        self.data = state.data;
        self.cnt_descent = state.cnt_descent;
        self.cnt_null = state.cnt_null;
        self.cnt_evals = state.cnt_evals;
        self.weighter
            .set_state(state.weighter_state)
            .map_err(|_| SolverStateError::RestoreWeighterState)?;

        let (tx, rx) = channel();
        self.client_tx = Some(tx.clone());
        self.client_rx = Some(rx);

        self.master_proc = if let Some(s) = state.master_state {
            let mut master = self.master.build().map_err(|_| SolverStateError::BuildMaster)?;
            let mut master = self.master.build().map_err(SolverStateError::BuildMaster)?;
            master
                .set_state(s.master_state)
                .map_err(|_| SolverStateError::RestoreMasterState)?;
                .map_err(SolverStateError::RestoreMasterState)?;

            Some(MasterProcess::start_with_center_idx(
                master,
                tx,
                &mut self.threadpool,
                s.center_idx,
            ))
974
975
976
977
978
979
980
981

982
983
984
985
986
987
977
978
979
980
981
982
983

984
985
986
987
988
989
990







-
+






            cnt_null: self.cnt_null,
            cnt_evals: self.cnt_evals,
            weighter_state: self
                .weighter
                .get_state()
                .map_err(|_| SolverStateError::GetWeighterState)?,
            master_state: if let Some(m) = self.master_proc.as_ref() {
                Some(m.get_state().map_err(|_| SolverStateError::GetMasterState)?)
                Some(m.get_state().map_err(SolverStateError::GetMasterState)?)
            } else {
                None
            },
        })
    }
}