Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

assert --> invariant #114

Merged
merged 2 commits into from
Jan 31, 2024
Merged

assert --> invariant #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3083376
one more assert
sumiya11 Jan 31, 2024
41b76fe
assert -> invariant
sumiya11 Jan 31, 2024
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
12 changes: 6 additions & 6 deletions src/reconstruction/crt.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,19 +310,19 @@ function crt_vec_full!(
) where {T <: Integer}
# indices = [(j, i) for j in 1:length(table_zz) for i in 1:length(table_zz[j])]
# crt_vec_partial!(table_zz, modulo, tables_ff, moduli, indices)
@assert isbitstype(T)
@assert length(moduli) > 0
@invariant isbitstype(T)
@invariant length(moduli) > 0

n = length(moduli)
# Base case
if n == 1
table_ff = tables_ff[1]
Base.GMP.MPZ.set_ui!(modulo, UInt64(moduli[1]))
@inbounds for i in 1:length(table_zz)
@assert length(table_zz[i]) == length(table_ff[i])
@invariant length(table_zz[i]) == length(table_ff[i])
for j in 1:length(table_zz[i])
rem_ij = UInt64(table_ff[i][j])
@assert 0 <= rem_ij < moduli[1]
@invariant 0 <= rem_ij < moduli[1]
table_zz[i][j] = rem_ij
end
end
Expand All @@ -343,8 +343,8 @@ function crt_vec_full!(
@inbounds for i in 1:length(table_zz)
for j in 1:length(table_zz[i])
for t in 1:n
@assert length(table_zz[i]) == length(tables_ff[t][i])
@assert 0 <= tables_ff[t][i][j] < moduli[t]
@invariant length(table_zz[i]) == length(tables_ff[t][i])
@invariant 0 <= tables_ff[t][i][j] < moduli[t]
rems[t] = UInt64(tables_ff[t][i][j])
end

Expand Down
8 changes: 4 additions & 4 deletions src/reconstruction/ratrec.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,15 +206,15 @@ function ratrec_vec_full!(
)
# indices = [(j, i) for j in 1:length(table_zz) for i in 1:length(table_zz[j])]
# ratrec_vec_partial!(table_qq, table_zz, modulo, indices)
@assert length(table_qq) == length(table_zz)
@assert modulo > 1
@invariant length(table_qq) == length(table_zz)
@invariant modulo > 1

modulo_nemo = Nemo.ZZRingElem(modulo)
@inbounds for i in 1:length(table_zz)
@assert length(table_zz[i]) == length(table_qq[i])
@invariant length(table_zz[i]) == length(table_qq[i])
for j in 1:length(table_zz[i])
rem_nemo = Nemo.ZZRingElem(table_zz[i][j])
@assert rem_nemo >= 0
@invariant 0 <= rem_nemo < modulo

success, (num, den) = ratrec_nemo(rem_nemo, modulo_nemo)
table_qq[i][j] = Base.unsafe_rational(num, den)
Expand Down
Loading