Merge pull request #14 from cseptesting/12-qa-tests-flat-file-catalog…

…-forecast-and-etas-src QA tests: Only CatalogForecast flat-files, and fix ETAS src code interface with floatcsep
cseptesting · Aug 2, 2024 · 48453c5 · 48453c5
2 parents 542758c + 5f59334
commit 48453c5
Show file tree

Hide file tree

Showing 46 changed files with 22,140 additions and 655 deletions.
diff --git a/examples/case_f/catalog.json b/examples/case_f/catalog.json
diff --git a/examples/case_f/config.yml b/examples/case_f/config.yml
@@ -1,20 +1,19 @@
-name: case_f
+name: case_g
 
 time_config:
-  start_date: 2012-5-23T00:00:00
-  end_date: 2012-6-23T00:00:00
-  horizon: 7days
+  start_date: 2016-11-14T00:00:00
+  end_date: 2016-11-21T00:00:00
+  horizon: 1day
   exp_class: td
 
 region_config:
-  region: italy_csep_region
-  mag_min: 3.5
+  region: nz_csep_region
+  mag_min: 3.6
   mag_max: 8.0
-  mag_bin: 0.5
+  mag_bin: 0.1
   depth_min: 0
-  depth_max: 70
+  depth_max: 30
 
-force_rerun: True
-catalog: catalog.csv
+catalog: catalog.json
 model_config: models.yml
 test_config: tests.yml
diff --git a/examples/case_f/etas/forecasts/etas_2016-11-14_2016-11-15.csv b/examples/case_f/etas/forecasts/etas_2016-11-14_2016-11-15.csv
diff --git a/examples/case_f/etas/forecasts/etas_2016-11-15_2016-11-16.csv b/examples/case_f/etas/forecasts/etas_2016-11-15_2016-11-16.csv
diff --git a/examples/case_f/etas/forecasts/etas_2016-11-16_2016-11-17.csv b/examples/case_f/etas/forecasts/etas_2016-11-16_2016-11-17.csv
diff --git a/examples/case_f/etas/forecasts/etas_2016-11-17_2016-11-18.csv b/examples/case_f/etas/forecasts/etas_2016-11-17_2016-11-18.csv
diff --git a/examples/case_f/etas/forecasts/etas_2016-11-18_2016-11-19.csv b/examples/case_f/etas/forecasts/etas_2016-11-18_2016-11-19.csv
diff --git a/examples/case_f/etas/forecasts/etas_2016-11-19_2016-11-20.csv b/examples/case_f/etas/forecasts/etas_2016-11-19_2016-11-20.csv
diff --git a/examples/case_f/etas/forecasts/etas_2016-11-20_2016-11-21.csv b/examples/case_f/etas/forecasts/etas_2016-11-20_2016-11-21.csv
diff --git a/examples/case_f/models.yml b/examples/case_f/models.yml
@@ -1,7 +1,5 @@
-- pymock:
-    path: pymock
-    func: python run.py
-    func_kwargs:
-      n_sims: 100
-      mag_min: 3.5
-    build: pip
+- etas:
+    path: etas/
+    class: td
+    n_sims: 100
+
diff --git a/examples/case_f/tests.yml b/examples/case_f/tests.yml
@@ -8,7 +8,12 @@
         - plot_consistency_test:
               plot_kwargs:
                   one_sided_lower: True
-
+- Catalog_S-test:
+    func: catalog_evaluations.spatial_test
+    plot_func:
+        - plot_consistency_test:
+              plot_kwargs:
+                  one_sided_lower: True
 
 
 
diff --git a/examples/case_g/config.yml b/examples/case_g/config.yml
@@ -1,9 +1,9 @@
-name: case_f
+name: case_g
 
 time_config:
-  start_date: 2016-8-25T00:00:00
-  end_date: 2016-8-27T00:00:00
-  horizon: 1days
+  start_date: 2012-5-23T00:00:00
+  end_date: 2012-6-23T00:00:00
+  horizon: 7days
   exp_class: td
 
 region_config:
@@ -14,6 +14,7 @@ region_config:
   depth_min: 0
   depth_max: 70
 
+force_rerun: True
 catalog: catalog.csv
 model_config: models.yml
 test_config: tests.yml
diff --git a/examples/case_g/models.yml b/examples/case_g/models.yml
@@ -1,28 +1,7 @@
-- etas:
-    giturl: https://git.gfz-potsdam.de/csep/it_experiment/models/vetas.git
-    args_file: input/args.json
-    path: models/etas
-    func: etas-run
-    func_kwargs:
-      n_sims: 1000
-      mc: 3.5
-    build: pip
-- Poisson Mock:
-    giturl: https://git.gfz-potsdam.de/csep/it_experiment/models/pymock.git
-    path: models/pymock_poisson
-    func: pymock
-    prefix: pymock
-    func_kwargs:
-      n_sims: 1000
-      mag_min: 3.5
-    build: pip
-- Negbinom Mock:
-    giturl: https://git.gfz-potsdam.de/csep/it_experiment/models/pymock.git
-    path: models/pymock_nb
+- pymock:
+    path: pymock
     func: pymock
     func_kwargs:
-      n_sims: 1000
+      n_sims: 100
       mag_min: 3.5
-      distribution: negbinom
-    build: pip
-    prefix: pymock
+    build: venv
diff --git a/examples/case_f/pymock/Dockerfile → examples/case_g/pymock/Dockerfile b/examples/case_f/pymock/Dockerfile → examples/case_g/pymock/Dockerfile
diff --git a/examples/case_f/pymock/README.md → examples/case_g/pymock/README.md b/examples/case_f/pymock/README.md → examples/case_g/pymock/README.md
diff --git a/examples/case_f/pymock/input/args.txt → examples/case_g/pymock/input/args.txt b/examples/case_f/pymock/input/args.txt → examples/case_g/pymock/input/args.txt
diff --git a/examples/case_f/pymock/pymock/__init__.py → examples/case_g/pymock/pymock/__init__.py b/examples/case_f/pymock/pymock/__init__.py → examples/case_g/pymock/pymock/__init__.py
diff --git a/examples/case_f/pymock/pymock/libs.py → examples/case_g/pymock/pymock/libs.py b/examples/case_f/pymock/pymock/libs.py → examples/case_g/pymock/pymock/libs.py
diff --git a/examples/case_f/pymock/pymock/main.py → examples/case_g/pymock/pymock/main.py b/examples/case_f/pymock/pymock/main.py → examples/case_g/pymock/pymock/main.py
diff --git a/examples/case_f/pymock/pyproject.toml → examples/case_g/pymock/pyproject.toml b/examples/case_f/pymock/pyproject.toml → examples/case_g/pymock/pyproject.toml
diff --git a/examples/case_f/pymock/requirements.txt → examples/case_g/pymock/requirements.txt b/examples/case_f/pymock/requirements.txt → examples/case_g/pymock/requirements.txt
diff --git a/examples/case_f/pymock/run.py → examples/case_g/pymock/run.py b/examples/case_f/pymock/run.py → examples/case_g/pymock/run.py
diff --git a/examples/case_f/pymock/setup.cfg → examples/case_g/pymock/setup.cfg b/examples/case_f/pymock/setup.cfg → examples/case_g/pymock/setup.cfg
diff --git a/examples/case_f/pymock/setup.py → examples/case_g/pymock/setup.py b/examples/case_f/pymock/setup.py → examples/case_g/pymock/setup.py
diff --git a/examples/case_g/tests.yml b/examples/case_g/tests.yml
@@ -1,7 +1,5 @@
 - Catalog_N-test:
     func: catalog_evaluations.number_test
-    func_kwargs:
-        verbose: False
     plot_func:
         - plot_number_test:
             plot_args:

diff --git a/examples/case_f/catalog.csv → examples/case_h/catalog.csv b/examples/case_f/catalog.csv → examples/case_h/catalog.csv
diff --git a/examples/case_h/config.yml b/examples/case_h/config.yml
@@ -0,0 +1,20 @@
+name: case_f
+
+time_config:
+  start_date: 2016-8-25T00:00:00
+  end_date: 2016-8-26T00:00:00
+  horizon: 1days
+  exp_class: td
+
+region_config:
+  region: italy_csep_region
+  mag_min: 3.5
+  mag_max: 8.0
+  mag_bin: 0.5
+  depth_min: 0
+  depth_max: 70
+
+force_rerun: True
+catalog: catalog.csv
+model_config: models.yml
+test_config: tests.yml
diff --git a/examples/case_h/models.yml b/examples/case_h/models.yml
@@ -0,0 +1,32 @@
+- etas:
+    giturl: https://git.gfz-potsdam.de/csep/it_experiment/models/vetas.git
+    repo_hash: v3.2
+    args_file: input/args.json
+    path: models/etas
+    func: etas-run
+    func_kwargs:
+      n_sims: 100
+      mc: 3.5
+      seed: 23
+- Poisson Mock:
+    giturl: https://git.gfz-potsdam.de/csep/it_experiment/models/pymock.git
+    repo_hash: v0.1
+    path: models/pymock_poisson
+    func: pymock
+    prefix: pymock
+    func_kwargs:
+      n_sims: 100
+      mag_min: 3.5
+      seed: 23
+- Negbinom Mock:
+    giturl: https://git.gfz-potsdam.de/csep/it_experiment/models/pymock.git
+    repo_hash: v0.1
+    path: models/pymock_nb
+    func: pymock
+    func_kwargs:
+      n_sims: 100
+      mag_min: 3.5
+      apply_mc_to_lambda: True
+      distribution: negbinom
+      seed: 23
+    prefix: pymock
diff --git a/examples/case_h/tests.yml b/examples/case_h/tests.yml
@@ -0,0 +1,16 @@
+- Catalog_N-test:
+    func: catalog_evaluations.number_test
+    func_kwargs:
+        verbose: False
+    plot_func:
+        - plot_number_test:
+            plot_args:
+                title: Number consistency test
+                bins: 30
+        - plot_consistency_test:
+            plot_args:
+                title: Number consistency test
+
+
+
+