Mercurial > repos > pointsource_algs / file comparison
comparison: src/sliding_pdps.rs
src/sliding_pdps.rs
- changeset 84
- edb5de5d5bd6
- parent 83
- 66b8ac0ebe00
- child 89
- 8d1c959432c8
equal
deleted
inserted
replaced
| 83:66b8ac0ebe00 | 84:edb5de5d5bd6 |
|---|---|
| 370 } | 370 } |
| 371 | 371 |
| 372 let fit = |μ̃: &RNDM<N, F>| { | 372 let fit = |μ̃: &RNDM<N, F>| { |
| 373 f.apply(Pair(μ̃, &z)) /*+ fnR.apply(z) + reg.apply(μ)*/ | 373 f.apply(Pair(μ̃, &z)) /*+ fnR.apply(z) + reg.apply(μ)*/ |
| 374 + fnH.apply(/* opKμ.apply(&μ̃) + */ opKz.apply(&z)) | 374 + fnH.apply(/* opKμ.apply(&μ̃) + */ opKz.apply(&z)) |
| 375 + reg.apply(μ̃) | |
| 375 }; | 376 }; |
| 376 | 377 |
| 377 μ.merge_spikes_fitness(config.insertion.final_merging_method(), fit, |&v| v); | 378 μ.merge_spikes_fitness(config.insertion.final_merging_method(), fit, |&v| v); |
| 378 μ.prune(); | 379 μ.prune(); |
| 379 Ok(Pair(μ, z)) | 380 Ok(Pair(μ, z)) |
