Repository navigation
feat!: remove the enums named like their modules - #47
Merged
Merged
Conversation
…agnostics for a supplied basis - SyntheticProbe.make takes centre: (row:, column:)? = nil. nil is py4DSTEM's (rows/2, columns/2) in Double, bit for bit as before; a pixel centre gives the pixel-centred disk exactly (tested against that construction on 25x23, 125x125 and 32x30). - FloatFFT2D is public with rows, columns, init? and supports(rows:columns:); the transforms stay package access. - LatticeStrain.consensusDiagnostics(_:basis:origin:minimumRadius:) scores a supplied basis (an initial basis) with the consensus's observations and Float32 scoring; for the chosen basis it equals chooseBasisConsensusResult exactly. The consumer check gains three checks (it failed to build before this change); 151 pass. Done: #10 items 1, 2 and 4. Next: item 3, the enums named like their modules, as its own breaking PR. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…ain, CuboEmbedding) Each held only the deprecated scope string, and its name shadowed the module, so a module-qualified name such as CuboStrain.LatticeStrain did not resolve. A renamed enum would be an empty namespace, so they are removed. The consumer check gains a module-qualified check that does not compile with the enums present. Migration: CuboPtycho, CuboStrain and CuboEmbedding (the enums) and their deprecated scope are removed; nothing replaces them. Module-qualified names such as CuboStrain.LatticeStrain now resolve. Done: #10 item 3, so all four plan items are in PRs. Next: mac4DSTEM deletes its centre interim and re-pins after the tag. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…odule-name check and the open item it closes) Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01VkKZEWLQDNR7GTJSa5geSZ
The merge took this branch's whole files for docs/open-items.md and the consumer check. That dropped main's newer lstsq note and its renamed consumer-check comments. Now both files are main's, plus this branch's two changes: the module-name check, and the open item it closes. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01VkKZEWLQDNR7GTJSa5geSZ
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Requested by Paul · project thread
Fixes #10, together with #46. This branch is stacked on #46, so merge #46 first; its diff then shrinks to this one commit.
This is item 3 of the 29 Oct plan.
enum CuboPtycho,enum CuboStrainandenum CuboEmbeddingshared their module's names, so a module-qualified name such asCuboStrain.LatticeStraindid not resolve. Each enum held only thescopestring that #41 deprecated, and nothing reads it. The plan suggested renaming them, but a renamed enum would be an empty namespace, so this PR removes them.Sources/CuboStrain/CuboStrain.swiftandSources/CuboPtycho/CuboPtycho.swift. The enum inSources/CuboEmbedding/CuboEmbedding.swiftis gone;EmbeddingErrorstays.CuboPtychotopic entry from the DocC catalog. The module pages are unchanged.docs/open-items.md: the module-name clash is no longer listed.Migration
CuboPtycho,CuboStrainandCuboEmbedding(the enums) and their deprecatedscopeare removed. Nothing replaces them. Module-qualified names such asCuboStrain.LatticeStrainnow resolve. mac4DSTEM uses none of the three enums orscope(searched), so it needs no call-site change.Tests
CuboStrain.LatticeStrain,CuboPtycho.PtychographyErrorandCuboEmbedding.PCAwith the unqualified types. It does not compile while the enums exist. It now passes, 152 checks with 0 failures.swift test -c release --parallel --skip CuboKitParityTests: green.BEGIN_COMMIT_OVERRIDE
feat!: remove the enums named like their modules
BREAKING CHANGE: CuboPtycho, CuboStrain and CuboEmbedding (the enums) and their deprecated scope are removed; nothing replaces them. Module-qualified names such as CuboStrain.LatticeStrain now resolve. mac4DSTEM uses none of the three enums or scope, so it needs no call-site change.
END_COMMIT_OVERRIDE
🤖 Generated with Claude Code