RsBundle  Diff

Differences From Artifact [1f983703ce]:

  • File src/solver.rs — part of check-in [f410ce94ba] at 2018-06-27 07:05:32 on branch error-handling — solver: remove unnecessary `move` from extend subgradient closure (user: fifr size: 36937)

To Artifact [d00a050ed7]:

  • File src/solver.rs — part of check-in [4dad0cad83] at 2018-08-18 11:15:25 on branch error-handling — Reformat (user: fifr size: 36920) [more...]

690
691
692
693
694
695
696
697
698

699
700
701
702
703
704
705
690
691
692
693
694
695
696


697
698
699
700
701
702
703
704







-
-
+







                    &newvars.iter().map(|v| (v.0, v.1, v.2)).collect::<Vec<_>>(),
                    &mut |fidx, minidx, vars| {
                        problem
                            .extend_subgradient(minorants[fidx][minidx].primal.as_ref().unwrap(), vars)
                            .map(DVector)
                            .map_err(|e| e.into())
                    },
                )
                .map_err(SolverError::Master)?;
                ).map_err(SolverError::Master)?;
            // modify moved variables
            for (index, val) in newvars.iter().filter_map(|v| v.0.map(|i| (i, v.3))) {
                self.cur_y[index] = val;
                self.nxt_y[index] = val;
                self.nxt_d[index] = 0.0;
            }
            // add new variables