initial work on refactoring parallelization of mcsolve to use qutip.parallel.parallel_map
remove commented code
support storing expectation values and states
fixed progressbar with parallel_map in mcsolve
resolved merge conflict
Merge remote-tracking branch 'origin/parallel-updates' into refactor-mcsolve-parallel
remove unnecessary warning
code cleanup, use num_cpu spec in options for parallel_map. fallback to serial_map if num_cpu is 1
code cleanup. unified styles
Merge branch 'master' into refactor-mcsolve-parallel
Merge branch 'master' into refactor-mcsolve-parallel
pep8 fixes
added unit test for mcsolve with collapse operators and states output
use average_states to get something that can be used with the expect function
added unit test for testing both expect and state output using Options(store_states=True)
code cleanup. removed unused code.
added unit test for expect+states output for case with no collapse operators
support for state+expect output for no-collapse operator case
simplify code for no-collapse operator case (get rid of a lot of setup code that is not needed)
simplify output setup code