From 59f49ea2132344df168f0115b93f3e8294e98707 Mon Sep 17 00:00:00 2001 From: Corwin Kerr Date: Mon, 20 Nov 2023 16:18:54 -0500 Subject: [PATCH 1/3] Fix conditions for compute msd --- projects/flow.2D-random-walk/src/project.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/flow.2D-random-walk/src/project.py b/projects/flow.2D-random-walk/src/project.py index f80bf90..f6047bc 100644 --- a/projects/flow.2D-random-walk/src/project.py +++ b/projects/flow.2D-random-walk/src/project.py @@ -125,7 +125,8 @@ def plot_mean_squared_displacement(job): @agg_analyze_and_plot @RandomWalkProject.pre(all_simulated) -@RandomWalkProject.post.true("msd_analyzed") +@RandomWalkProject.pre(lambda *jobs: "squared_displacement" in jobs[0].data) +@RandomWalkProject.post(lambda *jobs: jobs[0].doc.get("msd_analyzed")) @RandomWalkProject.operation(aggregator=std_aggregator) def compute_mean_squared_displacement(*jobs): """Compute and store the mean squared displacement for all std.""" From 464119510e929f2eb40b77545c88eb1bc38d5bec Mon Sep 17 00:00:00 2001 From: Corwin Kerr Date: Mon, 20 Nov 2023 16:19:12 -0500 Subject: [PATCH 2/3] Update init settings --- projects/flow.2D-random-walk/src/init.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/flow.2D-random-walk/src/init.py b/projects/flow.2D-random-walk/src/init.py index a594fc3..0ee298b 100644 --- a/projects/flow.2D-random-walk/src/init.py +++ b/projects/flow.2D-random-walk/src/init.py @@ -14,9 +14,9 @@ logger.setLevel(logging.ERROR) # The standard deviations to use for generating random walk moves -STANDARD_DEVIATIONS = np.linspace(start=0.1, stop=1, num=20) +STANDARD_DEVIATIONS = np.linspace(start=0.1, stop=1, num=5) NUMBER_REPLICAS = 100 -RUN_STEPS = 5_000 +RUN_STEPS = 10_000 MAX_SEED = 2**32 - 1 From 87a6335eacd0ad01f89e8bd273a2f1501dc8de67 Mon Sep 17 00:00:00 2001 From: Corwin Kerr Date: Mon, 20 Nov 2023 16:23:06 -0500 Subject: [PATCH 3/3] Use correct flag for verbose option See line 103 of flow-test.py --- projects/run-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/run-tests.sh b/projects/run-tests.sh index be10094..0a98d9e 100755 --- a/projects/run-tests.sh +++ b/projects/run-tests.sh @@ -18,5 +18,5 @@ for PROJECT in `ls -d */`; do conda install --yes ${USE_INDEX_CACHE} --file ${REQUIREMENTS_FILE} export USE_INDEX_CACHE="--use-index-cache" fi - python flow-test.py ${PROJECT} -vv --timeout=600 $@ + python flow-test.py ${PROJECT} -v --timeout=600 $@ done