The command used was:
svn merge -r23200:23199 .
This is part of restoring the SciPy quadratic integration in the frame order target functions.
Although incredibly slow, this will be useful for refining the final results, especially for models
whereby the number of Sobol' points collapses to zero.
.....
r23200 | bugman | 2014-05-16 14:14:48 +0200 (Fri, 16 May 2014) | 5 lines
Changed paths:
M /branches/frame_order_cleanup/target_functions/frame_order.py
Import cleanup for the frame order target functions.
The Scipy quadratic integration functions for the PCS have been removed.
.....
