Convert String predicate to ModuleSupplier predicate.

synthetichealth · Apr 3, 2024 · 2e587be · 2e587be
1 parent 3762fd3
commit 2e587be
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/main/java/org/mitre/synthea/engine/Module.java b/src/main/java/org/mitre/synthea/engine/Module.java
@@ -260,10 +260,10 @@ public static List<ModuleSupplier> getModuleSuppliers() {
    * @param predicate A predicate to filter a module based on path.
    * @return A list of ModuleSuppliers.
    */
-  public static List<ModuleSupplier> getModuleSuppliers(Predicate<String> predicate) {
+  public static List<ModuleSupplier> getModuleSuppliers(Predicate<ModuleSupplier> predicate) {
     List<ModuleSupplier> list = new ArrayList<ModuleSupplier>();
     modules.forEach((k, v) -> {
-      if (predicate.test(v.path)) {
+      if (predicate.test(v)) {
         list.add(v);
       }
     });

diff --git a/src/main/java/org/mitre/synthea/helpers/TransitionMetrics.java b/src/main/java/org/mitre/synthea/helpers/TransitionMetrics.java
@@ -111,12 +111,8 @@ public static void exportMetrics() {
     Path output = Paths.get(baseDir, statsDir);
     output.toFile().mkdirs();
 
-    List<ModuleSupplier> suppliers = Module.getModuleSuppliers();
+    List<ModuleSupplier> suppliers = Module.getModuleSuppliers(p -> !p.core);
     for (ModuleSupplier supplier : suppliers) {
-      if (supplier.core) {
-        // Java module
-        continue;
-      }
       // System.out.println("Saving statistics: " + supplier.path);
 
       Map<String, Metric> moduleMetrics = metrics.row(supplier.get().name);