Moved collectSamples to Policy.py. Updated several places to match the new interfaces in solveInMatrixFormat