revert: accuracy propagation changes from #299

crates/asap-aware-mapping/src/cost_model.rs

@@ -838,7 +838,6 @@ mod tests {
                         fields: vec![],
                         time_index: None,
                     },
-                    guarantee: None,
                 }),
                 family: family.clone(),
                 col: asap_types::pre_asap::expr_ir::ColumnRef::Named("value".into()),
@@ -853,7 +852,6 @@ mod tests {
                 }],
                 time_index: None,
             },
-            guarantee: None,
         }
     }
 

crates/asap-aware-mapping/src/grouping.rs

@@ -275,11 +275,6 @@ fn with_grouping(node: Rc<SummaryNode>, grouping: GroupingStrategy) -> Rc<Summar
                 query: query.clone(),
             },
             schema: node.schema.clone(),
-            // The per-subpopulation guarantee carries over unchanged: this
-            // axis only patches `grouping`. Hydra's own shared-grid noise
-            // term (issue #256, Theorem 2) is not folded in here — see
-            // issue #172's follow-ups.
-            guarantee: node.guarantee.clone(),
         }),
         SummaryExpr::SummaryAgg {
             child,
@@ -309,7 +304,6 @@ fn with_grouping(node: Rc<SummaryNode>, grouping: GroupingStrategy) -> Rc<Summar
                     grouping,
                 },
                 schema: grouped_schema,
-                guarantee: node.guarantee.clone(),
             })
         }
         // Never reached by this module's own callers (they only ever pass a

crates/asap-aware-mapping/src/lib.rs

@@ -168,20 +168,7 @@
 //! don't reduce to a fact about a summary family's kind alone. `control_plane`'s own
 //! `sketch_algebra::capability::Capability`/`is_satisfied_by` is the
 //! reference downstream implementation.
-//!
-//! - [`accuracy`] — the [`AccuracyModel`](accuracy::AccuracyModel) /
-//!   [`AccuracyBudgetAllocator`](accuracy::AccuracyBudgetAllocator)
-//!   extension points (issue #172): the planning-time algebra that derives
-//!   a machine-readable [`ResultGuarantee`](asap_types::post_asap::ResultGuarantee)
-//!   for every finalized post-ASAP value, propagates it through
-//!   approximate-over-approximate compositions under conservative rules
-//!   (no independence assumptions, unknown statistics stay unknown), and
-//!   rejects — before any `CostModel` ranks anything — every candidate with
-//!   no sound rule or one that misses the applicable `AccuracyTarget`.
-//!   Legality and cost are separate responsibilities; see that module's
-//!   docs for the pipeline order and the root-vs-per-node precedence rules.
 
-pub mod accuracy;
 pub mod accuracy_reconciliation;
 pub mod cost_model;
 pub mod explanation;
@@ -192,10 +179,6 @@ pub mod rewrite;
 pub mod rollup;
 pub mod topk_reuse;
 
-pub use accuracy::{
-    AccuracyAllocation, AccuracyBudgetAllocator, AccuracyModel, CompositionShape,
-    DefaultAccuracyModel, EqualSplitAllocator, PropagationStats,
-};
 pub use accuracy_reconciliation::AccuracyReconciliationStrategy;
 pub use cost_model::{CostModel, DefaultCostModel};
 pub use explanation::{
@@ -209,11 +192,10 @@ pub use recurrence::{
 };
 pub use replacement::{
     default_strategies, default_strategies_with, search_workload, search_workload_with,
-    search_workload_with_targets, summary_candidates, GlobalSelection, ImplementError,
-    Implementation, Matcher, MemoGroup, PlanSpace, Proposals, RankedGroup, RecurrenceProfileMap,
-    RejectedCandidate, Replacement, ReplacementProvenance, ReplacementStrategy, ReplacementSubDAG,
-    SelectedGroup, SharedSubtreeStrategy, SketchAlgorithmStrategy, TargetSubDAG,
-    MAX_SEARCH_ITERATIONS,
+    summary_candidates, GlobalSelection, ImplementError, Implementation, Matcher, MemoGroup,
+    PlanSpace, RankedGroup, RecurrenceProfileMap, Replacement, ReplacementProvenance,
+    ReplacementStrategy, ReplacementSubDAG, SelectedGroup, SharedSubtreeStrategy,
+    SketchAlgorithmStrategy, TargetSubDAG, MAX_SEARCH_ITERATIONS,
 };
 pub use rewrite::AvgToSumOverCountStrategy;
 pub use topk_reuse::TopKLimitReuseStrategy;

crates/asap-aware-mapping/src/recurrence.rs

@@ -771,8 +771,8 @@ mod tests {
 
     use crate::cost_model::CseCandidate;
     use asap_types::post_asap::{
-        ExactKind, ExactParams, GroupingStrategy, ResultGuarantee, SummaryExpr, SummaryFamilyType,
-        SummaryField, SummaryNode, SummarySchema,
+        ExactKind, ExactParams, GroupingStrategy, SummaryExpr, SummaryFamilyType, SummaryField,
+        SummaryNode, SummarySchema,
     };
     use asap_types::pre_asap::expr_ir::ColumnRef;
     use asap_types::pre_asap::query_expr::{QueryExpr, Reduction, Source};
@@ -803,7 +803,6 @@ mod tests {
                         fields: vec![],
                         time_index: None,
                     },
-                    guarantee: Some(ResultGuarantee::exact("KeepPreAsap")),
                 }),
                 family: family.clone(),
                 col: ColumnRef::Named("value".into()),
@@ -818,7 +817,6 @@ mod tests {
                 }],
                 time_index: None,
             },
-            guarantee: None,
         }
     }