Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
28 changes: 14 additions & 14 deletions crates/labcolors-core/contracts/clean-set-srgb8-v1/receipt-v1.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@
"sha256": "8bf5d5a1c0f00ce245a1ecb18b923aa1631483345962d72b633e466c242a8a1d"
},
{
"bytes": 13830,
"bytes": 13860,
"license": "MIT",
"path": "crates/labcolors-core/src/lib.rs",
"role": "module_registration_source",
"sha256": "1fdb8645a1f05c61232e362b89ef583198c131c493c3fab20c5ec545d02c6539"
"sha256": "55441efda3b9d8f8534cc015a15d4bf1390d74435738a1196c3bd44b6fb55120"
},
{
"bytes": 39439,
Expand All @@ -69,11 +69,11 @@
"sha256": "ec6585496208972e183d3a5bcd1f67bae4d89cc8e6a797d9c6443d8e0754502b"
},
{
"bytes": 46204,
"bytes": 51180,
"license": "MIT",
"path": "crates/labcolors-core/src/program/attachment.rs",
"role": "point_attachment_source",
"sha256": "172fa95ca1a4508c149c1ec0905baa7d1f93195e63a7574d4ed4b133e50099cc"
"sha256": "4caa55a5a72fbc9aa682c8a0fee5fd5490b2fd64bd4ce13c6d941c5bc6eecc7a"
},
{
"bytes": 35835,
Expand All @@ -83,32 +83,32 @@
"sha256": "0c8a7bb59464e1ddcace07b01ba24a64f8c9d3aeff547651dc38c276a0fc3322"
},
{
"bytes": 70163,
"bytes": 84322,
"license": "MIT",
"path": "crates/labcolors-core/src/program/attachment/tests.rs",
"role": "point_attachment_tests",
"sha256": "ac8c390a74c8aaea9e04d1006f3604d72f94a980ce26645d08593f025c4fc011"
"sha256": "ec01bb517beca62783c9b0a5335a6ef73fea420afcbf53e315deb28938de3382"
},
{
"bytes": 195880,
"bytes": 195771,
"license": "MIT",
"path": "crates/labcolors-core/src/program.rs",
"role": "program_facade_source",
"sha256": "86e372337ad2f21779596c8e608c6c18465577d336a2fc0a5dfcff0aaead5ec7"
"sha256": "6e187abc464884db41da7ab1fbec49abf97eb1a83a111f1c62e3a24ec0c069f9"
},
{
"bytes": 82393,
"bytes": 82656,
"license": "MIT",
"path": "crates/labcolors-core/src/program_identity.rs",
"role": "program_identity_source",
"sha256": "c6ae7d7e24240aa4249df1bf74f0e95711b6b889bd3650acdf11e1dd82f34123"
"sha256": "a1b7a592ad5046a686920102fd212319f000ee550ba179d1e20e846960fa781b"
},
{
"bytes": 220403,
"bytes": 224928,
"license": "MIT",
"path": "crates/labcolors-core/src/program_session.rs",
"role": "program_source",
"sha256": "db522c68cc992d71f806997123ead19fe5d7064d13b47580ea3fc33f95f02d00"
"sha256": "74ed68dfcffd487425eaca04917dd3c55921658209ee2394c539ee30ecbc8442"
},
{
"bytes": 21872,
Expand All @@ -125,11 +125,11 @@
"sha256": "aa6aa7c0b630437f1c1ba8c2ceafb0dadf6551c42331559504076a6cd44e6331"
},
{
"bytes": 26829,
"bytes": 27055,
"license": "MIT",
"path": "crates/labcolors-core/src/session.rs",
"role": "session_runtime_source",
"sha256": "383b163f9e715e3f5b313a3c29f962968dec3df2414cc8172e2def6b43236a83"
"sha256": "38c65b46a3e392b399092e8c4834d7f31acb2b91eff626d6faa1b1aaa90b52f3"
},
{
"bytes": 34105,
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
682da61a4becf096e83fef3052e12ee247b0a12359f4583ddf8a2ed04178175d receipt-v1.json
7faaf2132ca3eb0f3686c81953ecc3e3327e80d1d036f92c5f3227fc99cbb613 receipt-v1.json

Large diffs are not rendered by default.

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