Fix HPS construction test + triminx prism generator

Author: HactarCE

crates/hyperpuzzle/src/tests/hps_construction.rs

@@ -1,7 +1,7 @@
-use std::io::Write;
+use std::{io::Write, sync::Arc};
 
 use eyre::Result;
-use hyperpuzzle_core::{Puzzle, PuzzleLintOutput};
+use hyperpuzzle_core::{Catalog, CatalogMetadata, Puzzle, PuzzleLintOutput};
 
 use super::{load_new_catalog, time_it};
 
@@ -17,13 +17,13 @@ fn lint_all_puzzle_definitions() -> Result<(), String> {
 
     let mut out = String::new();
 
-    for entry in &*catalog.puzzle_list {
+    for entry in puzzles_in_list(&catalog) {
         if !LINT_EXPERIMENTAL && entry.tags.is_experimental() {
             continue;
         }
 
         let puzzle_lint_output = time_it(format!("Linting puzzle {}", entry.id), || {
-            PuzzleLintOutput::from_meta(entry)
+            PuzzleLintOutput::from_meta(&entry)
         })
         .0;
 
@@ -68,14 +68,14 @@ fn build_all_puzzles() -> Result<(), String> {
     let mut failed = vec![];
     let mut times = vec![];
     let t1 = std::time::Instant::now();
-    for entry in &*catalog.puzzle_list {
+    for entry in puzzles_in_list(&catalog) {
         if entry.tags.has_present("big") {
-            println!("Skipping big puzzle {} ({})", entry.name, entry.id,);
+            println!("Skipping big puzzle {} ({})", entry.name, entry.id);
             continue;
         }
 
         if entry.tags.is_experimental() {
-            println!("Skipping experimental puzzle {} ({})", entry.name, entry.id,);
+            println!("Skipping experimental puzzle {} ({})", entry.name, entry.id);
             continue;
         }
 
@@ -127,3 +127,21 @@ fn build_7x7x7x7() {
     result.expect("failed to build puzzle");
     println!("Done in {time:?}");
 }
+
+fn puzzles_in_list(catalog: &Catalog) -> Vec<Arc<CatalogMetadata>> {
+    catalog
+        .puzzle_list
+        .iter()
+        .map(|entry| {
+            if let Some(g) = &catalog.puzzles.generators.get(&entry.id.to_string())
+                && !g.params.is_empty()
+                && let Ok(default_generated_meta) =
+                    catalog.get_puzzle_metadata_blocking(&g.default_id())
+            {
+                default_generated_meta
+            } else {
+                Arc::clone(entry)
+            }
+        })
+        .collect()
+}

hps/puzzles/ft_prisms.hps

@@ -73,8 +73,8 @@ add_puzzle_generator(
                     // Slice layers
                     add_layers(#twists.base_axis, @util/layers.inclusive(h, -h, height))
                     add_layers(#twists.side_axis, polygon.shallow_cut_depths(width))
-                    if #twists.opposite_side_axis != null {
-                        add_layers(#twists.opposite_side_axis, @util/layers.opposite_depths(polygon.shallow_cut_depths(width)))
+                    if #twists.side_opposite_axis != null {
+                        add_layers(#twists.side_opposite_axis, @util/layers.opposite_depths(polygon.shallow_cut_depths(width)))
                     }
                 }
             },
@@ -138,8 +138,8 @@ add_puzzle_generator(
                     // Slice layers
                     add_layers(#twists.base_axis, @util/layers.inclusive(h, -h, height))
                     add_layers(#twists.side_axis, polygon.full_cut_depths(width))
-                    if #twists.opposite_side_axis != null {
-                        add_layers(#twists.opposite_side_axis, @util/layers.opposite_depths(polygon.full_cut_depths(width)))
+                    if #twists.side_opposite_axis != null {
+                        add_layers(#twists.side_opposite_axis, @util/layers.opposite_depths(polygon.full_cut_depths(width)))
                     }
                 }
             },
@@ -187,15 +187,15 @@ add_twist_system_generator(
                     add_twist(base_axis, #sym.thru([1, 0]), gizmo_pole_distance = 1)
                     add_twist(side_axis, #sym.thru([2, 0]), gizmo_pole_distance = 1)
 
-                    opposite_side_axis = null
+                    side_opposite_axis = null
                     if n == 3 {
-                        opposite_side_axis = add_axis(
-                            shape.opposite_side_pole,
-                            shape.opposite_side_names,
+                        side_opposite_axis = add_axis(
+                            shape.side_opposite_pole,
+                            shape.side_opposite_names,
                         )
-                        add_twist(opposite_side_axis, #sym.thru([0, 2]), gizmo_pole_distance = 1)
+                        add_twist(side_opposite_axis, #sym.thru([0, 2]), gizmo_pole_distance = 1)
                     }
-                    export opposite_side_axis
+                    export side_opposite_axis
                 }
 
                 // Add global twist directions

hps/shapes/prisms/polygonal_prism.hps

@@ -36,8 +36,8 @@ export fn new(n: Nat, t: Transform) -> Map {
     export side_pole = polygon.edge_pole
     export side_names = "a${polygon.edge_names}"
 
-    export opposite_side_pole = polygon.opposite_edge_pole
-    export opposite_side_names = "a${polygon.opposite_edge_names}"
+    export side_opposite_pole = polygon.edge_opposite_pole
+    export side_opposite_names = "a${polygon.edge_opposite_names}"
 }
 
 export fn facet_colors_list(n: Nat) -> List[Map] {