run: extended base graph + IV-->V

rmnldwg · Sep 18, 2022 · 53c4e9c · 53c4e9c
1 parent 8b0d97a
commit 53c4e9c
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 75 deletions.
diff --git a/dvc.lock b/dvc.lock
@@ -34,16 +34,16 @@ stages:
       size: 1092093
       nfiles: 8
     - path: ./models
-      md5: 3a8d99302e6ced04ebca38ce05d01263.dir
-      size: 4495040
+      md5: ff365c493b720ae4d8ad002729d4e5fb.dir
+      size: 4511040
       nfiles: 3
     - path: ./plots
-      md5: e1e1a6a9ac796ef966345d3c84ef6760.dir
-      size: 11978227
+      md5: 0c2019ca1f5b34a93f3372a9e1eda7ec.dir
+      size: 11677220
       nfiles: 4
     - path: metrics.json
-      md5: ca84a776ba88e64219856e2f38d907af
-      size: 93
+      md5: c33e5cfc6ef43b6e0c52893f401ab4a1
+      size: 92
   mermaid-readme:
     cmd: cat dag.md | sed 's/^/3i/' | sed -f- README.template > README.md
     deps:

diff --git a/params.yaml b/params.yaml
@@ -19,8 +19,8 @@ graph:
   lnl:
     I: []
     II: [III, V]
-    III: [IV, V]
-    IV: []
+    III: [IV]
+    IV: [V]
     V: []
     VII: []
 
@@ -207,34 +207,34 @@ prevalences:
   modality_spsn: [1.0, 1.0]
   t_stage: early
 
-- name: VandIII/early
-  pattern:
-    ipsi: {III: true, V: true}
-  modality: max_llh
-  modality_spsn: [1.0, 1.0]
-  t_stage: early
-
-- name: VnotIII/early
-  pattern:
-    ipsi: {III: false, V: true}
-  modality: max_llh
-  modality_spsn: [1.0, 1.0]
-  t_stage: early
-
-# - name: VandIV/early
+# - name: VandIII/early
 #   pattern:
-#     ipsi: {IV: true, V: true}
+#     ipsi: {III: true, V: true}
 #   modality: max_llh
 #   modality_spsn: [1.0, 1.0]
 #   t_stage: early
 
-# - name: VnotIV/early
+# - name: VnotIII/early
 #   pattern:
-#     ipsi: {IV: false, V: true}
+#     ipsi: {III: false, V: true}
 #   modality: max_llh
 #   modality_spsn: [1.0, 1.0]
 #   t_stage: early
 
+- name: VandIV/early
+  pattern:
+    ipsi: {IV: true, V: true}
+  modality: max_llh
+  modality_spsn: [1.0, 1.0]
+  t_stage: early
+
+- name: VnotIV/early
+  pattern:
+    ipsi: {IV: false, V: true}
+  modality: max_llh
+  modality_spsn: [1.0, 1.0]
+  t_stage: early
+
 # - name: VII/early
 #   pattern:
 #     ipsi: {VII: true}
@@ -327,34 +327,34 @@ prevalences:
   modality_spsn: [1.0, 1.0]
   t_stage: late
 
-- name: VandIII/late
-  pattern:
-    ipsi: {III: true, V: true}
-  modality: max_llh
-  modality_spsn: [1.0, 1.0]
-  t_stage: late
-
-- name: VnotIII/late
-  pattern:
-    ipsi: {III: false, V: true}
-  modality: max_llh
-  modality_spsn: [1.0, 1.0]
-  t_stage: late
-
-# - name: VandIV/late
+# - name: VandIII/late
 #   pattern:
-#     ipsi: {IV: true, V: true}
+#     ipsi: {III: true, V: true}
 #   modality: max_llh
 #   modality_spsn: [1.0, 1.0]
 #   t_stage: late
 
-# - name: VnotIV/late
+# - name: VnotIII/late
 #   pattern:
-#     ipsi: {IV: false, V: true}
+#     ipsi: {III: false, V: true}
 #   modality: max_llh
 #   modality_spsn: [1.0, 1.0]
 #   t_stage: late
 
+- name: VandIV/late
+  pattern:
+    ipsi: {IV: true, V: true}
+  modality: max_llh
+  modality_spsn: [1.0, 1.0]
+  t_stage: late
+
+- name: VnotIV/late
+  pattern:
+    ipsi: {IV: false, V: true}
+  modality: max_llh
+  modality_spsn: [1.0, 1.0]
+  t_stage: late
+
 # - name: VII/late
 #   pattern:
 #     ipsi: {VII: true}

diff --git a/pipeline/dvc.lock b/pipeline/dvc.lock
@@ -90,8 +90,8 @@ stages:
             - V
             III:
             - IV
+            IV:
             - V
-            IV: []
             V: []
             VII: []
         modalities:
@@ -159,19 +159,19 @@ stages:
             rel_acor_threshold: 0.075
     outs:
     - path: models/samples.hdf5
-      md5: 066637ba44f3f27ced84724db6fa9b6a
+      md5: 98bacfd9c7c354c6bded124a75ffc562
       size: 3428560
     - path: plots/sampling/accept_rates.csv
-      md5: 83b4305a04a8738bda9044b7bd6844e9
-      size: 1117
+      md5: 8940bdb8411c6b515b4166dd81d0380b
+      size: 1029
     - path: plots/sampling/acor_times.csv
-      md5: 8680ec2a5f791d46c3eb257bdc5d9dd3
-      size: 1126
+      md5: 34f6cf42bd22930547baf1cae039ff2b
+      size: 1049
   predict-risks:
     cmd: "lyscripts predict risks models/samples.hdf5 models/risks.hdf5\n"
     deps:
     - path: models/samples.hdf5
-      md5: 066637ba44f3f27ced84724db6fa9b6a
+      md5: 98bacfd9c7c354c6bded124a75ffc562
       size: 3428560
     params:
       params.yaml:
@@ -191,8 +191,8 @@ stages:
             - V
             III:
             - IV
+            IV:
             - V
-            IV: []
             V: []
             VII: []
         model:
@@ -237,16 +237,16 @@ stages:
           invert: false
     outs:
     - path: models/risks.hdf5
-      md5: e4766c32eaf84e80094b2467b5cc9dac
-      size: 169608
+      md5: 334321addc3a83669da808ea0b63d6ff
+      size: 185608
   evaluate:
     cmd: "lyscripts evaluate data/cleaned.csv models/samples.hdf5 --metrics metrics.json\n"
     deps:
     - path: data/cleaned.csv
       md5: e275605eda82421e85d10dbd68a26609
       size: 155737
     - path: models/samples.hdf5
-      md5: 066637ba44f3f27ced84724db6fa9b6a
+      md5: 98bacfd9c7c354c6bded124a75ffc562
       size: 3428560
     params:
       params.yaml:
@@ -266,8 +266,8 @@ stages:
             - V
             III:
             - IV
+            IV:
             - V
-            IV: []
             V: []
             VII: []
         modalities:
@@ -313,7 +313,7 @@ stages:
           thin_by: 5
           temp_schedule:
           - 0.0
-          - 1.316872427983538e-06
+          - 1.316872427983539e-06
           - 4.2139917695473246e-05
           - 0.0003200000000000001
           - 0.0013484773662551439
@@ -335,16 +335,16 @@ stages:
             rel_acor_threshold: 0.075
     outs:
     - path: metrics.json
-      md5: ca84a776ba88e64219856e2f38d907af
-      size: 93
+      md5: c33e5cfc6ef43b6e0c52893f401ab4a1
+      size: 92
   predict-prevalences:
     cmd: "lyscripts predict prevalences models/samples.hdf5 data/cleaned.csv models/prevalences.hdf5\n"
     deps:
     - path: data/cleaned.csv
       md5: e275605eda82421e85d10dbd68a26609
       size: 155737
     - path: models/samples.hdf5
-      md5: 066637ba44f3f27ced84724db6fa9b6a
+      md5: 98bacfd9c7c354c6bded124a75ffc562
       size: 3428560
     params:
       params.yaml:
@@ -364,8 +364,8 @@ stages:
             - V
             III:
             - IV
+            IV:
             - V
-            IV: []
             V: []
             VII: []
         model:
@@ -407,20 +407,20 @@ stages:
           - 1.0
           - 1.0
           t_stage: early
-        - name: VandIII/early
+        - name: VandIV/early
           pattern:
             ipsi:
-              III: true
+              IV: true
               V: true
           modality: max_llh
           modality_spsn:
           - 1.0
           - 1.0
           t_stage: early
-        - name: VnotIII/early
+        - name: VnotIV/early
           pattern:
             ipsi:
-              III: false
+              IV: false
               V: true
           modality: max_llh
           modality_spsn:
@@ -454,20 +454,20 @@ stages:
           - 1.0
           - 1.0
           t_stage: late
-        - name: VandIII/late
+        - name: VandIV/late
           pattern:
             ipsi:
-              III: true
+              IV: true
               V: true
           modality: max_llh
           modality_spsn:
           - 1.0
           - 1.0
           t_stage: late
-        - name: VnotIII/late
+        - name: VnotIV/late
           pattern:
             ipsi:
-              III: false
+              IV: false
               V: true
           modality: max_llh
           modality_spsn:
@@ -476,18 +476,18 @@ stages:
           t_stage: late
     outs:
     - path: models/prevalences.hdf5
-      md5: 3860ba954e6dc86882edee73f0b827b5
+      md5: 26723022fdacb75fe46c6e66014770bc
       size: 896872
   plot-corner:
     cmd: "lyscripts plot corner models/samples.hdf5 plots/corner.png\n"
     deps:
     - path: models/samples.hdf5
-      md5: 066637ba44f3f27ced84724db6fa9b6a
+      md5: 98bacfd9c7c354c6bded124a75ffc562
       size: 3428560
     outs:
     - path: plots/corner.png
-      md5: 3834293b29c353be5a419be399017d59
-      size: 6113773
+      md5: 2f23e8783fe382838688dabd25fbfad6
+      size: 5901705
     - path: plots/corner.svg
-      md5: b78f3822cdfce5fbd1c791e095e37541
-      size: 5862211
+      md5: d3fe4fa5f0ac91fb2cbd7ebb047114f7
+      size: 5773437