Mercurial > repos > pointsource_algs / file comparison
comparison: src/forward_pdps.rs
src/forward_pdps.rs
- changeset 84
- edb5de5d5bd6
- parent 81
- 642141008293
- child 89
- 8d1c959432c8
equal
deleted
inserted
replaced
| 83:66b8ac0ebe00 | 84:edb5de5d5bd6 |
|---|---|
| 295 } | 295 } |
| 296 | 296 |
| 297 let fit = |μ̃: &RNDM<N, F>| { | 297 let fit = |μ̃: &RNDM<N, F>| { |
| 298 f.apply(Pair(μ̃, &z)) /*+ fnR.apply(z) + reg.apply(μ)*/ | 298 f.apply(Pair(μ̃, &z)) /*+ fnR.apply(z) + reg.apply(μ)*/ |
| 299 + fnH.apply(/* opKμ.apply(&μ̃) + */ opKz.apply(&z)) | 299 + fnH.apply(/* opKμ.apply(&μ̃) + */ opKz.apply(&z)) |
| 300 + reg.apply(μ̃) | |
| 300 }; | 301 }; |
| 301 | 302 |
| 302 μ.merge_spikes_fitness(config.insertion.final_merging_method(), fit, |&v| v); | 303 μ.merge_spikes_fitness(config.insertion.final_merging_method(), fit, |&v| v); |
| 303 μ.prune(); | 304 μ.prune(); |
| 304 Ok(Pair(μ, z)) | 305 Ok(Pair(μ, z)) |
