Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions crates/labcolors-core/src/constraints/family.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
//! Метаданные code-owned evaluator-а принадлежности точному образу family.

use crate::family::{
AdmittedFamilySetV1, FamilyMembershipMeasurementV1, FamilyMembershipPassV1,
FamilyMembershipViolationV1,
FamilyMembershipMeasurementV2, FamilyMembershipPassV1, FamilyMembershipViolationV1,
};
use crate::family_artifact::AdmittedFamilyArtifactV2;
use crate::lcs_occurrence::ColorSignal;

use super::HardDecision;
Expand All @@ -14,8 +14,8 @@ pub(crate) enum FamilyMembershipIdentityV1 {
}

#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub(crate) enum FamilyMembershipReleaseV1 {
V1,
pub(crate) enum FamilyMembershipReleaseV2 {
V2,
}

#[derive(Debug, Clone, Copy, PartialEq, Eq)]
Expand All @@ -24,15 +24,15 @@ pub(crate) enum FamilyMembershipCapabilityV1 {
}

#[derive(Debug, Clone, Copy, Default, PartialEq, Eq)]
pub(crate) struct FamilyMembershipV1;
pub(crate) struct FamilyMembershipV2;

impl FamilyMembershipV1 {
impl FamilyMembershipV2 {
pub(crate) const fn identity(self) -> FamilyMembershipIdentityV1 {
FamilyMembershipIdentityV1::ExactImageMembershipV1
}

pub(crate) const fn release(self) -> FamilyMembershipReleaseV1 {
FamilyMembershipReleaseV1::V1
pub(crate) const fn release(self) -> FamilyMembershipReleaseV2 {
FamilyMembershipReleaseV2::V2
}

pub(crate) const fn capability(self) -> FamilyMembershipCapabilityV1 {
Expand All @@ -41,10 +41,10 @@ impl FamilyMembershipV1 {

pub(crate) fn assess(
self,
family: &AdmittedFamilySetV1,
family: &AdmittedFamilyArtifactV2,
signal: ColorSignal,
) -> (
FamilyMembershipMeasurementV1,
FamilyMembershipMeasurementV2,
HardDecision<FamilyMembershipPassV1, FamilyMembershipViolationV1>,
) {
family.assess(signal)
Expand Down
6 changes: 3 additions & 3 deletions crates/labcolors-core/src/constraints/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ pub(crate) use exact::{

mod family;
pub(crate) use family::{
FamilyMembershipCapabilityV1, FamilyMembershipIdentityV1, FamilyMembershipReleaseV1,
FamilyMembershipV1,
FamilyMembershipCapabilityV1, FamilyMembershipIdentityV1, FamilyMembershipReleaseV2,
FamilyMembershipV2,
};

#[cfg(test)]
Expand Down Expand Up @@ -520,7 +520,7 @@ pub(crate) enum ProgramConstraintContentV1 {
},
FamilyMembership {
identity: FamilyMembershipIdentityV1,
release: FamilyMembershipReleaseV1,
release: FamilyMembershipReleaseV2,
capability: FamilyMembershipCapabilityV1,
},
ExactSrgb8Relation {
Expand Down
26 changes: 11 additions & 15 deletions crates/labcolors-core/src/constraints/relation.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
use crate::Srgb8;
use crate::constraints::{FamilyMembershipV1, HardDecision, ProgramConstraintContentV1};
use crate::constraints::{FamilyMembershipV2, HardDecision, ProgramConstraintContentV1};
use crate::family::{
FamilyDeclarationV1, FamilyId, FamilyMembershipMeasurementV1, FamilyMembershipPassV1,
FamilyMembershipViolationV1,
FamilyId, FamilyMembershipMeasurementV2, FamilyMembershipPassV1, FamilyMembershipViolationV1,
};
use crate::family_artifact::BoundFamilyArtifactBundleV2;
use crate::lcs_occurrence::ColorSignal;

fn exact_srgb8_equal(left: Srgb8, right: Srgb8) -> bool {
Expand Down Expand Up @@ -188,7 +188,7 @@ pub(crate) enum CoreIntrinsicUnaryMeasurementV1 {
ExactSrgb8(ExactSrgb8IntrinsicUnaryMeasurementV1),
FamilyMembership {
family: FamilyId,
measurement: FamilyMembershipMeasurementV1,
measurement: FamilyMembershipMeasurementV2,
},
}

Expand Down Expand Up @@ -225,7 +225,7 @@ impl CoreIntrinsicUnaryInvocationV1 {
}
}
Self::FamilyMembership { .. } => {
let profile = FamilyMembershipV1;
let profile = FamilyMembershipV2;
ProgramConstraintContentV1::FamilyMembership {
identity: profile.identity(),
release: profile.release(),
Expand All @@ -240,7 +240,7 @@ impl CompiledCoreIntrinsicUnaryInvocationV1 {
pub(crate) fn assess(
self,
actual: Srgb8,
families: &[FamilyDeclarationV1],
families: &BoundFamilyArtifactBundleV2,
) -> Option<(
CoreIntrinsicUnaryMeasurementV1,
HardDecision<CoreIntrinsicUnaryPassV1, CoreIntrinsicUnaryViolationV1>,
Expand All @@ -265,16 +265,12 @@ impl CompiledCoreIntrinsicUnaryInvocationV1 {
family,
family_index,
} => {
// Compile-time связывает индекс с этим exact FamilyId; `None`
// здесь означает порчу compiled graph, а не штатное отсутствие
// evidence, и вызывающий слой переводит его в InternalInvariant.
let declaration = families.get(family_index)?;
if declaration.id() != family {
return None;
}
let set = declaration.set();
// Compile-time ordinal и Session projection независимо
// связываются через semantic release; runtime lookup не читает
// opaque FamilyId. `None` поэтому означает порчу compiled state.
let artifact = families.artifact(family_index)?;
let (measurement, decision) =
FamilyMembershipV1.assess(set, ColorSignal::from_srgb8(actual));
FamilyMembershipV2.assess(artifact, ColorSignal::from_srgb8(actual));
let decision = match decision {
HardDecision::Pass(proof) => {
HardDecision::Pass(CoreIntrinsicUnaryPassV1::FamilyMembership(proof))
Expand Down
Loading
Loading