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

Dev #3

Open
wants to merge 145 commits into
base: master
Choose a base branch
from
+10,954 −373,254
Open

Dev #3

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
145 commits
Select commit Hold shift + click to select a range
d946b24
added grammars
Nov 13, 2014
d2c3f8b
newest changes to LCP
Nov 14, 2014
ef94827
added lemma hashmap
Nov 14, 2014
dc81b9b
added grammar
Nov 14, 2014
163eadf
resolved conflicts
Nov 14, 2014
c3ffd3e
added first
Nov 19, 2014
a2fa036
added src/main running package, analyzer shell file
Nov 19, 2014
14a463f
Added Celex morphology access class and routines
Nov 21, 2014
4446351
Attempt to merge Celex morph additions with morph generation code.
Nov 21, 2014
6992b6c
changed constraint modification to ANalysis, vs. cxn
Nov 21, 2014
3e12e7f
Merge branch 'dev' of https://github.com/icsi-berkeley/compling into dev
Nov 21, 2014
a3d303e
First attempts to merge.
Nov 21, 2014
16fb23a
added unit test for analyzer
Nov 21, 2014
8e11875
merging of ECGMorph code
Nov 21, 2014
b7f40c3
HashMap style of input, vs. Construction[][], to present both <type> …
Nov 22, 2014
dd1fda5
Integrated ECG Morph class into LCP object; modified input arrays of …
Nov 24, 2014
7c5d6b5
Integrated ECG Morph further, began making more complex hashmap.
Nov 26, 2014
64edc66
Morphology implemented - still some bugs to be ironed out, but Analyz…
Dec 2, 2014
64dd614
test commit, changing input array
Dec 2, 2014
0485447
Fixed bugs - due to problems with input arrays. Resolved issue, now s…
Dec 2, 2014
31a941b
Added support for ECGTokenReader plus some examples.
Dec 2, 2014
a02ad3f
Integrated ECGTokenReader, created new MorphTokenPair class to contai…
Dec 3, 2014
bc90471
Fixed to handle multiple tokens with the same lemma (e.g. green-the-l…
Dec 3, 2014
5cc60de
Changed token file to be delimited to :: instead of TAB.
Dec 3, 2014
580624c
merging
Dec 3, 2014
d0772bf
All sentences in prefs file work using Token/Morphology system. Furth…
Dec 4, 2014
8466e7c
Sentences in prefs file working, can use both lexical cxns and token …
Dec 4, 2014
313157b
A bit more error checking on token file.
Dec 4, 2014
2cfb8d5
Latest commit, added new testing files
Dec 4, 2014
8d08145
Added new testing files
Dec 4, 2014
ee34e68
Testing files, unit tests work for specializer/analyzer.
Dec 4, 2014
650f667
Fixed regexp for comment strings.
Dec 4, 2014
926004d
Fixed problem with multiple parses - related to morphology tables.
Dec 5, 2014
be8c39b
Added MorphTableReader. Reads in Morph data. TABLE_PATH must be speci…
Dec 5, 2014
3647872
Fixed issue with * constraint overriding inherited constraints. Added…
Dec 10, 2014
dc68738
Workbench build.
Dec 10, 2014
ae0c8ce
Added robots morph file
Dec 10, 2014
a533656
Added Workbench model for testing on other platforms
Dec 10, 2014
932554a
Removed Workbench test, unnecessarily for Git repository
Dec 11, 2014
7b41347
Added GUI stuff
Dec 16, 2014
9126be0
Added tokenView file, developing token editor
Dec 16, 2014
1d41097
Created 'Token Editor' view. A Simple way of adding tokens to token f…
Dec 17, 2014
d6110cc
Added combo box
Dec 20, 2014
108524c
Added backup code, changed token view to drop-down menus. Still needs…
Jan 5, 2015
9c18028
Major changes to GUI: Token editor, including changes to ontology / t…
Jan 15, 2015
bdbf8af
Added untracked files, such as icons.
Jan 15, 2015
374b9dc
Added compositional testing grammar.
Jan 20, 2015
d419089
Made package changes - freezing before trying new system in which pre…
Jan 26, 2015
5c12f0d
More package changes. Some changes to GUI - GUI still buggy.
Jan 28, 2015
a1d8ee5
Re-added adjective file
Jan 28, 2015
9f6d353
Compositional progress: working in GUI and command line version. Sear…
Feb 4, 2015
c273255
Compositional robot progress. Package/import statements functional in…
Feb 5, 2015
eed15b6
Added MORSE shell, updated ontology to a list of ontologies. Changed …
Feb 11, 2015
9e254e6
Added grammar files.
Feb 11, 2015
b9e4a39
worked on proximity testing in robot model.
Mar 6, 2015
3c8e694
Added universal schemas and Spanish grammar to dev branch.
Mar 9, 2015
48e729a
Added version of workbench-demo for testing.
Mar 9, 2015
5c564f3
Added Windows version as well as Mac Version of ECG Workbench, for te…
Mar 10, 2015
84cf703
Added grammar files to starter, etc.
Mar 10, 2015
01e58d0
Changed semantic camera, changed scene.py in morse, added Workbench f…
Mar 11, 2015
cfe074d
New version of windows.
Mar 11, 2015
68513ac
Added windows.
Mar 11, 2015
275e05f
Added windows.
Mar 11, 2015
a492763
testing Windows.
Mar 11, 2015
2a30e3c
workbench
Mar 12, 2015
f1a6745
Changed Workbench so that it can read in multiple ontology files. Ont…
Mar 25, 2015
8d3491d
Workbench patches: reads in multiple ontology files, works on multipl…
Mar 30, 2015
4e2f59b
Workbench patches: reads in multiple ontology files, works on multipl…
Mar 30, 2015
19f0926
Fixed robot grammar.
Mar 31, 2015
e841298
Added workbench, fixed robot grammar, changed prompt. Prompt still te…
Mar 31, 2015
b74e5ce
Added purchases
Mar 31, 2015
26ef6e1
Fixed packaging system. Packages are now kept in relational data stru…
Apr 2, 2015
73c0564
test
Apr 6, 2015
17505a3
Started fixing size issue.
Apr 6, 2015
467a4cc
Started fixing size issue.
Apr 6, 2015
ad104bb
Fixed size
Apr 6, 2015
e2a743f
Added package viewer.
Apr 7, 2015
c874ba5
Updated grammars.
Apr 7, 2015
a978818
Added token folder to views. Fixed package viewer.
Apr 7, 2015
3652da1
Fixed @be in grammar.
Apr 8, 2015
212585f
Fixed crosscheck params.
Apr 8, 2015
6ce5bb8
Added MappingReader to Analyzer. Analyzer now returns a HashMap/dicti…
Apr 8, 2015
97f34ab
Fixed MappingReader. Added new JAR.
Apr 8, 2015
d8431a9
Added new workbench models, with mapping reader fixed. Grammars + src…
Apr 9, 2015
b778bac
Added new workbench models, with mapping reader fixed. Grammars + src…
Apr 9, 2015
be35832
Removed full-path and grammar stuff. Only has Analyzer code now.
Apr 9, 2015
e51e320
Removed full-path and grammar stuff. Only has Analyzer code now.
Apr 9, 2015
2dc1810
New workbench model. Doesn't reload types in token editor when you ch…
Apr 14, 2015
61f2f43
New workbench model. Doesn't reload types in token editor when you ch…
Apr 14, 2015
5ce7d22
Flushes cache without slowing everything down. Grammar check issues h…
Apr 14, 2015
7ab8ec6
Type-caching. Limited, but functional.
Apr 24, 2015
1a3c1a2
Lexicon Viewer, type-caching, token-reloader.
May 5, 2015
ad968d6
Fixed workbench bug
May 6, 2015
64107df
Added link tool to Lexicon Viewer.
May 8, 2015
0f5464a
Get lexicon
Jun 15, 2015
2526940
Fixed first constraint problem, doing testing now.
Jun 23, 2015
5ec6c8e
Added linux package
Jun 23, 2015
4f2d1bc
Added linux
Jun 23, 2015
dbc6c8f
Fixed second constraint problem, involving schemas. Changed addLocalS…
Jun 24, 2015
0dee9eb
Constraint fixes.
Jun 24, 2015
0dc9066
Constraint fixes.
Jun 24, 2015
973867e
Merge branch 'constraint_bugfix' of https://github.com/icsi-berkeley/…
Jun 24, 2015
c048708
bug fix
Jun 24, 2015
c454afd
workbench
Jun 24, 2015
6d810d6
New workbench models
Jun 25, 2015
e7b8085
Adding better error handling and message broadcasting.
Jul 8, 2015
8de241d
Added much better error checking and error handling.
Jul 9, 2015
d2f4bb8
Better error tracking, new workbench
Jul 10, 2015
ed30505
New workbench model. Messages are now broadcast.
Jul 20, 2015
6ab2932
Committing a stable version
Aug 18, 2015
f4dfdb5
Changed time when tokens are added. Still working on modifying contex…
Aug 20, 2015
1f6785d
Changed iscompatible2 in LeftCornerParser, fixed token reader.
Aug 25, 2015
9842dcf
Iscompatibe, etc.
Aug 26, 2015
bec20f9
Updated ontology reader.
Aug 28, 2015
b02ee91
Dev branch commit. Ontology now gets rebuilt when tokens are added, w…
Sep 14, 2015
fc2f171
successfully added draw2d display, working on grammar grapher.
Nov 5, 2015
aef9a8f
Analyzer
Dec 10, 2015
138ac12
comitting
Dec 14, 2015
f477f5a
New GUI annotation testing, parser notifies of unknown words.
Mar 8, 2016
152935b
Added span text to semspec, as well as check for morph analyzer
Mar 11, 2016
095958a
Package Viewer, ECG Analyzer variable beam search, and annotation for…
Mar 29, 2016
95bcfcc
Committing stable
Apr 21, 2016
5e10929
Added negated and unidirectional constraints
Apr 21, 2016
76aa865
updated text for SemSpec GUI display, new constraint for grammar (<=)…
Apr 27, 2016
d3d3c60
Added Unknown word exception...
Aug 1, 2016
acb682e
added Utterance Generator
Aug 1, 2016
af34f3a
Remove left and bottom panels of workbench default perspective
vivekraghuram Sep 6, 2016
34cd611
Remove java 7 dependency and increase max memory of the application t…
vivekraghuram Sep 22, 2016
5e56723
tmp checkpoint
vivekraghuram Oct 27, 2017
1475cb1
Handle two-word tokens by separating them with an underscore
vivekraghuram Nov 12, 2017
5c19488
Ignore DS_Store
vivekraghuram Nov 19, 2017
0f91cc0
Upgrade to java8 and remove extraneous files
vivekraghuram Dec 13, 2017
1505b2b
Merge pull request #4 from icsi-berkeley/java8
vivekraghuram Jan 25, 2018
9d3f46a
Add (faulty) constraint tracking
EthanGoldberg Feb 20, 2018
3f49697
Fix minor bugs
EthanGoldberg Feb 20, 2018
8e77a9f
Add remove button
EthanGoldberg Mar 6, 2018
a7c38f0
Add basic morphology editor functionality
EthanGoldberg Mar 20, 2018
bb9fe61
Commit before adding new morph view
EthanGoldberg Apr 10, 2018
0fe56e5
Create morph view
EthanGoldberg Apr 10, 2018
add176e
Finish morph editor alpha
EthanGoldberg Apr 10, 2018
1314f1b
Remove comments
EthanGoldberg Apr 12, 2018
770acc5
Fix bugs with multitoken support
vivekraghuram Apr 15, 2018
ef1e8c0
Merge pull request #6 from icsi-berkeley/token-tool
vivekraghuram May 14, 2018
80ed899
Create README.md
vivekraghuram May 14, 2018
efd384a
Update README.md
vivekraghuram May 23, 2018
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
11 changes: 0 additions & 11 deletions compling.core/base2m/.project
View file
Open in desktop

This file was deleted.

Empty file removed compling.core/base2m/English morphology in ECG.pdf
View file
Open in desktop
Empty file.
40 changes: 0 additions & 40 deletions compling.core/base2m/README.txt
View file
Open in desktop

This file was deleted.

84 changes: 0 additions & 84 deletions compling.core/base2m/base2m-core/adj.grm
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions compling.core/base2m/base2m-core/adverb.grm
View file
Open in desktop

This file was deleted.

135 changes: 0 additions & 135 deletions compling.core/base2m/base2m-core/argstruct-causation.grm
View file
Open in desktop

This file was deleted.

44 changes: 0 additions & 44 deletions compling.core/base2m/base2m-core/argstruct-control.grm
View file
Open in desktop

This file was deleted.

Loading