Skip to content

Commit 1b5f6d3

Browse files
committed
fix: resolve merge conflicts and fix syntax errors in extraction scripts
1 parent 97617dd commit 1b5f6d3

16 files changed

Lines changed: 170855 additions & 3088 deletions

scripts/extract_isabelle_tropical.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const START_ID = 200000
3333

3434
# Path to the tropical-resource-typing repo (sibling of neural-foundations).
3535
# Adjust if your checkout differs.
36-
const TROPICAL_REPO = abspath(joinpath(REPO_ROOT, "..", "..", "..", "..", "tropical-resource-typing"))
36+
const TROPICAL_REPO = abspath(joinpath(REPO_ROOT, "..", "tropical-resource-typing"))
3737

3838
const THY_FILES = [
3939
("Tropical_v2.thy", "tropical_v2"),
@@ -527,7 +527,7 @@ function synthetic_isabelle_algebra()::Vector{IsabelleEntry}
527527
"\"dim_row A = n \\<Longrightarrow> dim_col A = m \\<Longrightarrow>\n c \\<cdot>\\<^sub>m (d \\<cdot>\\<^sub>m A) = (c * d) \\<cdot>\\<^sub>m (A :: 'a :: semiring_0 mat)\"",
528528
"by (rule smult_smult_assoc)"),
529529
("matrix_row_col",
530-
"\"i < dim_row A \\<Longrightarrow> j < dim_col A \\<Longrightarrow>\n (A :: 'a mat) $$ (i, j) = row A i $ j\"",
530+
"\"i < dim_row A \\<Longrightarrow> j < dim_col A \\<Longrightarrow>\n (A :: 'a mat) \$\$ (i, j) = row A i \$ j\"",
531531
"by (simp add: row_def)"),
532532
("matrix_dim_mult",
533533
"\"dim_row (A * B) = dim_row A\"",

scripts/extract_mizar.jl

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -388,26 +388,26 @@ function generate_synthetic_mizar()::Vector{Dict{String,Any}}
388388
]
389389

390390
lattices = [
391-
("lattice_join_comm", "for L being Lattice, a, b being Element of L holds a \"\\\/\" b = b \"\\\/\" a",
392-
"let L be Lattice; let a, b be Element of L; thus a \"\\\/\" b = b \"\\\/\" a by LATTICES:def 1;"),
391+
("lattice_join_comm", "for L being Lattice, a, b being Element of L holds a \"\\/\" b = b \"\\/\" a",
392+
"let L be Lattice; let a, b be Element of L; thus a \"\\/\" b = b \"\\/\" a by LATTICES:def 1;"),
393393
("lattice_meet_comm", "for L being Lattice, a, b being Element of L holds a \"/\\\" b = b \"/\\\" a",
394394
"let L be Lattice; let a, b be Element of L; thus a \"/\\\" b = b \"/\\\" a by LATTICES:def 2;"),
395-
("lattice_join_assoc", "for L being Lattice, a, b, c being Element of L holds a \"\\\/\" (b \"\\\/\" c) = (a \"\\\/\" b) \"\\\/\" c",
396-
"let L be Lattice; let a, b, c be Element of L; thus a \"\\\/\" (b \"\\\/\" c) = (a \"\\\/\" b) \"\\\/\" c by LATTICES:def 5;"),
395+
("lattice_join_assoc", "for L being Lattice, a, b, c being Element of L holds a \"\\/\" (b \"\\/\" c) = (a \"\\/\" b) \"\\/\" c",
396+
"let L be Lattice; let a, b, c be Element of L; thus a \"\\/\" (b \"\\/\" c) = (a \"\\/\" b) \"\\/\" c by LATTICES:def 5;"),
397397
("lattice_meet_assoc", "for L being Lattice, a, b, c being Element of L holds a \"/\\\" (b \"/\\\" c) = (a \"/\\\" b) \"/\\\" c",
398398
"let L be Lattice; let a, b, c be Element of L; thus a \"/\\\" (b \"/\\\" c) = (a \"/\\\" b) \"/\\\" c by LATTICES:def 7;"),
399-
("lattice_absorption_join", "for L being Lattice, a, b being Element of L holds a \"\\\/\" (a \"/\\\" b) = a",
400-
"let L be Lattice; let a, b be Element of L; thus a \"\\\/\" (a \"/\\\" b) = a by LATTICES:def 8;"),
401-
("lattice_absorption_meet", "for L being Lattice, a, b being Element of L holds a \"/\\\" (a \"\\\/\" b) = a",
402-
"let L be Lattice; let a, b be Element of L; thus a \"/\\\" (a \"\\\/\" b) = a by LATTICES:def 9;"),
403-
("lattice_distributive", "for L being distributive Lattice, a, b, c being Element of L holds a \"/\\\" (b \"\\\/\" c) = (a \"/\\\" b) \"\\\/\" (a \"/\\\" c)",
404-
"let L be distributive Lattice; let a, b, c be Element of L; thus a \"/\\\" (b \"\\\/\" c) = (a \"/\\\" b) \"\\\/\" (a \"/\\\" c) by LATTICES:def 11;"),
405-
("lattice_complemented", "for L being complemented bounded Lattice, a being Element of L ex b being Element of L st a \"\\\/\" b = Top L & a \"/\\\" b = Bottom L",
406-
"let L be complemented bounded Lattice; let a be Element of L; thus ex b being Element of L st a \"\\\/\" b = Top L & a \"/\\\" b = Bottom L by LATTICES:def 19;"),
407-
("lattice_bounded", "for L being bounded Lattice, a being Element of L holds a \"\\\/\" (Bottom L) = a & a \"/\\\" (Top L) = a",
408-
"let L be bounded Lattice; let a be Element of L; thus a \"\\\/\" (Bottom L) = a by LATTICES:39; thus a \"/\\\" (Top L) = a by LATTICES:41;"),
409-
("lattice_modular", "for L being modular Lattice, a, b, c being Element of L st a [= c holds a \"\\\/\" (b \"/\\\" c) = (a \"\\\/\" b) \"/\\\" c",
410-
"let L be modular Lattice; let a, b, c be Element of L; assume a [= c; hence a \"\\\/\" (b \"/\\\" c) = (a \"\\\/\" b) \"/\\\" c by LATTICES:def 12;"),
399+
("lattice_absorption_join", "for L being Lattice, a, b being Element of L holds a \"\\/\" (a \"/\\\" b) = a",
400+
"let L be Lattice; let a, b be Element of L; thus a \"\\/\" (a \"/\\\" b) = a by LATTICES:def 8;"),
401+
("lattice_absorption_meet", "for L being Lattice, a, b being Element of L holds a \"/\\\" (a \"\\/\" b) = a",
402+
"let L be Lattice; let a, b be Element of L; thus a \"/\\\" (a \"\\/\" b) = a by LATTICES:def 9;"),
403+
("lattice_distributive", "for L being distributive Lattice, a, b, c being Element of L holds a \"/\\\" (b \"\\/\" c) = (a \"/\\\" b) \"\\/\" (a \"/\\\" c)",
404+
"let L be distributive Lattice; let a, b, c be Element of L; thus a \"/\\\" (b \"\\/\" c) = (a \"/\\\" b) \"\\/\" (a \"/\\\" c) by LATTICES:def 11;"),
405+
("lattice_complemented", "for L being complemented bounded Lattice, a being Element of L ex b being Element of L st a \"\\/\" b = Top L & a \"/\\\" b = Bottom L",
406+
"let L be complemented bounded Lattice; let a be Element of L; thus ex b being Element of L st a \"\\/\" b = Top L & a \"/\\\" b = Bottom L by LATTICES:def 19;"),
407+
("lattice_bounded", "for L being bounded Lattice, a being Element of L holds a \"\\/\" (Bottom L) = a & a \"/\\\" (Top L) = a",
408+
"let L be bounded Lattice; let a be Element of L; thus a \"\\/\" (Bottom L) = a by LATTICES:39; thus a \"/\\\" (Top L) = a by LATTICES:41;"),
409+
("lattice_modular", "for L being modular Lattice, a, b, c being Element of L st a [= c holds a \"\\/\" (b \"/\\\" c) = (a \"\\/\" b) \"/\\\" c",
410+
"let L be modular Lattice; let a, b, c be Element of L; assume a [= c; hence a \"\\/\" (b \"/\\\" c) = (a \"\\/\" b) \"/\\\" c by LATTICES:def 12;"),
411411
]
412412

413413
metric_spaces = [

0 commit comments

Comments
 (0)