Skip to content

typos, orthography #6

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

Open
Yakushima wants to merge 264 commits into
base: master
Choose a base branch
from
Open

typos, orthography #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
264 commits
Select commit Hold shift + click to select a range
401715f
Get rid of vi tmp file
Yakushima Jun 22, 2022
9b02f0b
Got a real unit test to run
Yakushima Nov 17, 2022
266cc37
Added more IntList unit tests
Yakushima Nov 19, 2022
7ec0590
More tests; some typos in comments fixed
Yakushima Nov 22, 2022
9f5eb59
Code comments & rearrangement; new test module
Yakushima Dec 9, 2022
755bdf0
Edits to comments & class members, more tests
Yakushima Dec 10, 2022
13bc9df
renaming of members of Spine
Yakushima Dec 10, 2022
40a1d32
ObStack test code added
Yakushima Dec 11, 2022
6b56a6a
More readable Clause.java; more testing for IMap
Yakushima Dec 11, 2022
b9b4a76
Touchups
Yakushima Dec 13, 2022
27397cc
Some slight rewrites -- clearer var/fn names
Yakushima Dec 17, 2022
d3d64a1
Toks.java comments, fixed TestIntList call
Yakushima Dec 18, 2022
14744ac
Added Toks tests
Yakushima Dec 18, 2022
46219d2
Touchups
Yakushima Dec 21, 2022
a033a69
Clearer variable IDs
Yakushima Dec 23, 2022
ceef2e4
More comments + clearer var IDs
Yakushima Dec 25, 2022
24a4ac2
More comments, better var IDs
Yakushima Dec 28, 2022
838c2d2
comments, var ID changes
Yakushima Dec 28, 2022
4566014
Reverted some var IDs; clearer (?) output
Yakushima Dec 29, 2022
7c3ee66
Comments
Yakushima Jan 19, 2023
291f44c
go.sh script fix; start java-coded equationalizer
Yakushima Jan 29, 2023
7c23e72
Added initial Term class
Yakushima Jan 29, 2023
756c66f
touchups; added tests for Term class
Yakushima Feb 1, 2023
bdab661
Flattening is sort of working....
Yakushima Feb 4, 2023
eb4bafd
Added more test code
Yakushima Feb 6, 2023
7f8bf22
go.sh -ea flag; asm lang built & run thru API
Yakushima Feb 8, 2023
1e6c623
some refactoring on Engine.java, mostly
Yakushima Feb 9, 2023
62a393c
API now allows lc in 1st char of var; hacky
Yakushima Feb 9, 2023
d2c1261
API now allows upper case constants (w/o quoting)
Yakushima Feb 10, 2023
ddd12cf
Removed excessive trace output
Yakushima Feb 12, 2023
524322e
Fixes to handling of set_Prolog/set_TarauLog
Yakushima Feb 13, 2023
96dee1f
Better management of tokenization
Yakushima Feb 13, 2023
48cd231
Less redundant setting of lexical items
Yakushima Feb 14, 2023
cef18b6
lexemes changed to protected
Yakushima Feb 14, 2023
23185e3
Ready for trying to get rid of "Equation" const
Yakushima Feb 15, 2023
ddfa76f
Got rid of const Equation in Term
Yakushima Feb 15, 2023
32e245e
Abbreviating; starting on testing output
Yakushima Feb 16, 2023
66c0bf4
Term unit test checking expected answers
Yakushima Feb 17, 2023
377fe6f
Clause construction for API
Yakushima Feb 21, 2023
49cbd38
Clause toString sort of working
Yakushima Feb 21, 2023
a678e08
TestTerm cleanup, bug fix to term_made_from
Yakushima Feb 23, 2023
46221be
touchups
Yakushima Feb 24, 2023
00334d9
More on lists; made sure old tests still work
Yakushima Feb 28, 2023
4ce2d5c
list API sort of working
Yakushima Mar 5, 2023
bcf7754
Lists sort of working
Yakushima Mar 29, 2023
1ecad64
Fixup for flattening clauses; rm trace msgs
Yakushima Apr 7, 2023
50603cf
some work with traces mostly
Yakushima May 17, 2023
c363363
Did the last change not take?
Yakushima May 17, 2023
4bd7819
Debugged(?) flattened form
Yakushima May 27, 2023
7a60e9b
forgot to remove some dead code
Yakushima May 27, 2023
570e0ee
Cleaned out unneeded () traces and asserts
Yakushima May 28, 2023
e2f5318
Adding TestClause.java
Yakushima May 28, 2023
b67f902
More tests of flattening, some traces removed
Yakushima May 29, 2023
09dffe9
rm traces+redundant tests, refactored flatten test
Yakushima May 30, 2023
f28d705
Restored some code to make it compilable again
Yakushima Jun 1, 2023
fd77b73
refactored Term to getter/setter for v/c/terms
Yakushima Jun 3, 2023
9bb2dc8
Fixups for API/flatten()
Yakushima Jun 10, 2023
67f0cd2
Cleanups
Yakushima Jun 10, 2023
90d0fd8
Fix for composing lists with '|(
Yakushima Jun 13, 2023
94a7cae
Trace output cleanup
Yakushima Jun 13, 2023
13deafb
Yet another fix to flatten(); but J chars broken
Yakushima Jun 21, 2023
ab4ac23
Cleanups, traces deleted/commented-out
Yakushima Jun 21, 2023
956eb7f
added perms test; more fixes to code generation
Yakushima Jun 22, 2023
b55ff78
directory cleanup
Yakushima Jun 26, 2023
6cf9490
More cleanups
Yakushima Jun 26, 2023
efeaa39
Up in IntelliJ again
Yakushima Jun 27, 2023
8861ca4
More cleanups, packaging, renaming
Yakushima Jul 2, 2023
e0c55f0
Fixed problem seen w/ Linux Toks.toSentences
Yakushima Jul 17, 2023
389cf31
correct handling of _; better fmt for asm output
Yakushima Jul 23, 2023
3e427c4
Output closer to .nl fmt; crlf prob solved
Yakushima Jul 23, 2023
ac08afc
closer to .nl fmt; same modulo -w
Yakushima Jul 23, 2023
221b2b5
output identical to .nl files(?)
Yakushima Jul 23, 2023
6ff298f
Japanese test now seems to work
Yakushima Jul 24, 2023
1858a9c
Japanese code cleanup
Yakushima Jul 24, 2023
388b734
Some cleanups; TryPerms still very messy
Yakushima Jul 25, 2023
a2e9f31
big cleanup
Yakushima Jul 26, 2023
29a5ab9
vert bar notation fixed; Lambdas test in progress
Yakushima Aug 2, 2023
889105c
Problem with infinite loop on lambdas.pl solved
Yakushima Aug 4, 2023
acfdfdc
A start on factoring tests out of TestTerm mudball
Yakushima Aug 4, 2023
c6aed31
Finished breaking out progs tests into own Junits
Yakushima Aug 5, 2023
5321d25
Sud4x added, lambdas & mperms fixed
Yakushima Aug 8, 2023
4ba65b2
trimmed, commented out msgs, etc.
Yakushima Aug 9, 2023
5115aeb
Some things work in TestProg sandbox
Yakushima Aug 14, 2023
766b70e
one-level one-arg struct terms lambda-ized
Yakushima Aug 15, 2023
5b3f2c0
multi-arg nested structs lambda-ized
Yakushima Aug 15, 2023
264d078
initial list lambda-ization; cleanups
Yakushima Aug 16, 2023
924377f
started on getting vars from superclass TestTerm
Yakushima Aug 17, 2023
eb2d592
A start on constants in API
Yakushima Aug 20, 2023
43c9926
New Java API seems to work OK now
Yakushima Aug 23, 2023
e5bf5f5
Full commit of new API
Yakushima Aug 23, 2023
b4b700e
Add test converted to better API
Yakushima Aug 23, 2023
e193286
Trying P_/pair fixes
Yakushima Aug 24, 2023
4754334
TestPerms converted to new API
Yakushima Aug 24, 2023
2e75c48
Mperms converted to new API
Yakushima Aug 24, 2023
8fb35e6
test Big converted to new API
Yakushima Aug 28, 2023
183a759
Queens converted to new API
Yakushima Aug 28, 2023
b48629f
genLambdas test code converted to new API
Yakushima Sep 1, 2023
aa8fc33
Converted sud4x test to new API
Yakushima Sep 1, 2023
3f6a225
sud4x cleanups
Yakushima Sep 1, 2023
57e7969
Some cleanups
Yakushima Sep 11, 2023
bf03bd2
Chopped out some dead code I might revive
Yakushima Sep 11, 2023
6e8fdaa
(nil)
Yakushima Oct 18, 2023
078cfae
adding a snapshot jar
Yakushima Oct 18, 2023
4517beb
cleanups
Yakushima Oct 19, 2023
e370f6c
JLPAPI carve-out, some cleanups
Yakushima Oct 19, 2023
59be00f
Forgot to add JLPAPI.java
Yakushima Oct 19, 2023
6746ddb
Got JLPAPI working
Yakushima Oct 19, 2023
7b72e19
cpp coded added
Yakushima Dec 21, 2023
6f8131f
cleaner cpp transfer
Yakushima Dec 23, 2023
28706bf
minor cleanups, match count restored
Yakushima Dec 25, 2023
74f6a8e
cleanups, match count restored
Yakushima Dec 25, 2023
ca060f7
More cleanups
Yakushima Dec 25, 2023
0ff67d5
Cleaning out some binaries, mostly
Yakushima Dec 25, 2023
4a59648
.gitignore fix to exclude VS disposables
Yakushima Dec 25, 2023
f4fc84e
reduced dependence on list concat
Yakushima Dec 26, 2023
64971aa
cleaned up main.cpp, some VS files
Yakushima Dec 26, 2023
87a5822
Converted CellList to shared_ptr
Yakushima Dec 26, 2023
35ec45f
Back to unrolled loop
Yakushima Dec 28, 2023
c8aa59b
Reduced RAM by deleting stale Spines
Yakushima Dec 28, 2023
9b5d3f7
Lower (?) overhead CellStack class
Yakushima Dec 29, 2023
118b60c
Got unrolled-loop copy working again in pushCells
Yakushima Dec 31, 2023
9d0d222
removed CellList size call for speedup; trimmed
Yakushima Jan 3, 2024
61ecf93
More trimming
Yakushima Jan 3, 2024
c2f0d04
removed dangerous size_t decls; more trimming
Yakushima Jan 3, 2024
027efec
Delete IP/cpp/x64/Release directory
Yakushima Jan 7, 2024
fea8890
Delete IP/cpp/iProlog/x64/Release directory
Yakushima Jan 7, 2024
b8aca81
Delete IP/cpp/Debug directory
Yakushima Jan 7, 2024
7ab8ebc
Delete IP/cpp/.vs/iPrologC++/v17/ipch/AutoPCH directory
Yakushima Jan 7, 2024
bd92df2
Delete IP/target directory
Yakushima Jan 7, 2024
77a1cc5
Made it compile on Ubuntu with g++
Yakushima Jan 9, 2024
a9f3b88
Fixups, moved pp() to prog.cpp
Yakushima Jan 10, 2024
59ff714
removed a.out
Yakushima Jan 10, 2024
fb3253d
inlined a general cell copy
Yakushima Jan 10, 2024
37a2e78
Full cell copy loop unrolling
Yakushima Jan 10, 2024
ac535f7
some cleanups, notes
Yakushima Jan 12, 2024
a8e802f
Transitional, on the way to standalone engine
Yakushima Jan 12, 2024
de9c15f
loop unrolling cleanups
Yakushima Jan 12, 2024
663549a
More reorg for engine.cpp standalone
Yakushima Jan 12, 2024
343d20f
reorg of main.cpp
Yakushima Jan 12, 2024
9826bb0
parsing & code gen moved to main.cpp
Yakushima Jan 12, 2024
2a75406
Touchups + added to notes
Yakushima Jan 12, 2024
b0dcf57
engine.cpp mostly moved to prog.cpp
Yakushima Jan 13, 2024
34eff53
index in separate class
Yakushima Jan 15, 2024
68f156f
remove .0 files from commit
Yakushima Jan 15, 2024
3e6231e
Cleanups
Yakushima Jan 15, 2024
066cee0
IntMap now template, indexing still broken
Yakushima Jan 20, 2024
510bda8
stronger typing (cell), better encaps, but indexing still broken
Yakushima Jan 22, 2024
3e74198
Lots of type refactoring in cpp
Yakushima Feb 25, 2024
23b1ae2
Some refactoring of cell, etc.
Yakushima Feb 27, 2024
102f801
Yet more refactoring
Yakushima Feb 29, 2024
9a3ff23
clean commit
Yakushima Feb 29, 2024
39327ff
asserts finally looking at their arg
Yakushima Feb 29, 2024
6adbc9b
Symbol table now classier
Yakushima Mar 1, 2024
c1fa169
symbol table now has Inty sym indices
Yakushima Mar 1, 2024
2572736
a config.h added, starting on stronger typing
Yakushima Mar 2, 2024
be9fe23
Tracing out the types
Yakushima Mar 3, 2024
32fcc5e
Cleanups
Yakushima Mar 3, 2024
c55bf0a
Got rid of IntMap.cpp, header-only now
Yakushima Mar 4, 2024
08224af
Made Inty a template
Yakushima Mar 4, 2024
9ca76fe
xs -> index_vector
Yakushima Mar 10, 2024
ebb33ee
cs->unifiables
Yakushima Mar 10, 2024
3274202
ustack->unify_stack
Yakushima Mar 11, 2024
a6e999e
k->last_clause_tried
Yakushima Mar 11, 2024
29ddeb2
hgs/goal_refs -> skeleton
Yakushima Mar 11, 2024
6664b70
more renamings
Yakushima Mar 11, 2024
3625715
More robust initialization of index vectors
Yakushima Mar 11, 2024
3ed4eea
hgs -> skeleton in Java code
Yakushima Mar 11, 2024
0038dc9
carved out symbol table from Engine.java
Yakushima Mar 11, 2024
47270eb
sym->symTab in cpp
Yakushima Mar 11, 2024
8eab049
Optional int rather than new Integer in sym_tab
Yakushima Mar 15, 2024
670d4f1
Carved index out of Engine
Yakushima Mar 15, 2024
87bcc99
Further separation of index module
Yakushima Mar 15, 2024
3648dd9
More modularization of indexing
Yakushima Mar 15, 2024
a1baae7
moved possible_match to index
Yakushima Mar 15, 2024
ba37986
Yet more modularization of indexing
Yakushima Mar 15, 2024
8ac238e
indexing now dependent on Engine
Yakushima Mar 15, 2024
248a8d3
index acknowledges dependence on Engine
Yakushima Mar 15, 2024
33a2f0e
Clean out objs
Yakushima Mar 15, 2024
90cdc7e
More separation of indexing
Yakushima Mar 15, 2024
b98123d
More modularization of indexing
Yakushima Mar 15, 2024
04394ba
Some reorg for indexing
Yakushima Mar 15, 2024
9ae37a3
Cleaner access to heap
Yakushima Mar 15, 2024
d868837
Further isolation of indexing
Yakushima Mar 15, 2024
8fe72d1
Some cleanups
Yakushima Mar 16, 2024
048628b
Indexing now seems to work in C++ code
Yakushima Apr 13, 2024
d643639
Got rid of Integer class
Yakushima Apr 14, 2024
58b7cf1
Simplified IMap to just use unordered_map
Yakushima Apr 14, 2024
c798352
removed a lot of checkit() calls
Yakushima Apr 14, 2024
d755c64
removed TRY...CATCH uses
Yakushima Apr 14, 2024
e8db28f
Fixed output bug; lots of trace trash now though
Yakushima Apr 18, 2024
7b284e4
Traces turned off
Yakushima Apr 18, 2024
e4da83d
Traces off for indexing case too
Yakushima Apr 18, 2024
b520d69
IntMap->IntSet cleanup
Yakushima Apr 19, 2024
a1a9523
yanked traces, optimized(?) IntSet
Yakushima Apr 20, 2024
aa9a952
slight optimizations to matching_clauses
Yakushima Apr 20, 2024
32e2682
clearer typedef
Yakushima Apr 20, 2024
9e73144
Fixed IntSet bug, indexing works better now
Yakushima Apr 24, 2024
b02ebb7
Fixed yet another indexing bug, one remains
Yakushima Apr 25, 2024
83eda25
slight optimization of imaps
Yakushima Apr 27, 2024
c3186c5
Fixed bug I added to IntSet
Yakushima Apr 29, 2024
3652b35
optimize index more
Yakushima Apr 30, 2024
7320ac9
Consolidated some indexing code
Yakushima May 1, 2024
add142a
started refactoring of IntSet
Yakushima May 1, 2024
051c5f1
Sentinels on index vectors working
Yakushima May 2, 2024
3753f83
More refactoring on IntSet
Yakushima May 2, 2024
0ab0304
First refactoring of IntSet
Yakushima May 7, 2024
1a428d3
cleaned out most Java code traces
Yakushima May 7, 2024
ddf09b7
Dumped the flat array of Vorontsov's Java
Yakushima May 8, 2024
e77dbd5
Prep for explicit CellList memory management
Yakushima May 9, 2024
912008b
More prep for raw cell lists, etc.
Yakushima May 9, 2024
46999f5
Prepping for goals_list reversal
Yakushima May 9, 2024
d3cd4db
refactory toward raw memory goals list
Yakushima May 10, 2024
f985c01
raw goals list working
Yakushima May 11, 2024
3312d9f
Better CellList collection, still leaky
Yakushima May 11, 2024
eebde50
CellList recycling working OK now, less leaky
Yakushima May 11, 2024
67f1612
Spine now has its own free list pool
Yakushima May 12, 2024
a36d902
temporary "hg_array" type as I refactor
Yakushima May 14, 2024
3381b70
Some cleanups
Yakushima May 14, 2024
9406bc3
hg_array -> unfolding (for lack of better term)
Yakushima May 14, 2024
b08316f
new_Spine now does cell list buffering
Yakushima May 15, 2024
844c226
Got rid of skeleton buffering
Yakushima May 16, 2024
bf83c37
Optimization of indexing continues
Yakushima May 24, 2024
25ff12d
minor cleanups + C-ish quicksort for index
Yakushima May 26, 2024
7b653d6
Some minor changes
Yakushima Oct 19, 2024
608616a
prep for null ref -> unbound var
Yakushima Oct 22, 2024
369bd5a
Verified unify stack can be on Engine heap
Yakushima Oct 22, 2024
faa5dc2
refactoring for library & sep NSM verbs
Yakushima Jul 25, 2025
791b7f7
Some comments, cleanups
Yakushima Jul 27, 2025
840f720
Commented out distracting traces
Yakushima Jul 27, 2025
ed66ef3
formatting touchups
Yakushima Jul 29, 2025
46bc691
Renamed LPvar->LPv
Yakushima Jul 30, 2025
643bfc9
init_LPvars->init_LPvs
Yakushima Jul 30, 2025
2907b8f
minor fixes
Yakushima Aug 8, 2025
33bade5
minor cleanups
Yakushima Aug 8, 2025
0e5d899
more syntax sugar
Yakushima Aug 9, 2025
cc9912f
cleanups, more sugar, but TestTerm slightly broken
Yakushima Aug 9, 2025
906b5d8
more cleanups
Yakushima Aug 12, 2025
79b6f33
class LPv -> LP_
Yakushima Aug 12, 2025
0bcbc3f
More cleanups
Yakushima Aug 28, 2025
09667ee
negation hack seems to work
Yakushima Sep 29, 2025
65e7772
hacked a "not" into Toks
Yakushima Sep 29, 2025
b22358e
slightly iffy negation optimization
Yakushima Sep 29, 2025
2ff9302
rewrites, started work on Engine for not, if, etc.
Yakushima Oct 6, 2025
8b54302
Prog fork() seems to work OK
Yakushima Oct 7, 2025
30d9bc7
refactored Prog/Engine creation
Yakushima Oct 7, 2025
d64e861
unfold() simplification
Yakushima Oct 11, 2025
b9f3d21
cleanups, slight refactorings
Yakushima Oct 12, 2025
f8100aa
added traces, more formatting for them
Yakushima Oct 13, 2025
34f2181
reworked unfold() traces
Yakushima Oct 13, 2025
095d52f
yanked out clone() support, mainly
Yakushima Oct 13, 2025
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
8 changes: 8 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,13 @@
*.tar.gz
*.rar

# Visual Studio
*.pch
*.ipch
*.exe
*.obj
*.pdb
cpp/.vs/

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
508 changes: 0 additions & 508 deletions .idea/inspectionProfiles/Project_Default.xml
View file
Open in desktop

This file was deleted.

81 changes: 0 additions & 81 deletions .idea/misc.xml
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/modules.xml
View file
Open in desktop

This file was deleted.

31 changes: 31 additions & 0 deletions IP/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# Compiled class file
*.class

# Log file
*.log

# BlueJ files
*.ctxt

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar

# Visual Studio
*.pch
*.ipch
*.exe
*.obj
*.pdb
cpp/.vs/

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
0 .idea/.gitignore → IP/.idea/.gitignore
View file
Open in desktop
File renamed without changes.
5 changes: 5 additions & 0 deletions IP/.idea/codeStyles/codeStyleConfig.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions IP/.idea/compiler.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions IP/.idea/encodings.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions IP/.idea/jarRepositories.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions IP/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions IP/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_0.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions IP/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_6_0.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions IP/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_0.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions IP/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_6_0.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions IP/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions IP/.idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading