Skip to content

add normalization step of embedded undifferentiated/ground-fact-differentiated objectification #9

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

Merged
merged 8 commits into from
Sep 17, 2020
Merged

add normalization step of embedded undifferentiated/ground-fact-differentiated objectification #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7e9838a
raise error if whitespace follows hash ('#')
mthom Aug 14, 2020
228cfb3
Merge branch 'master' of https://github.com/RuleML/PSOATransRunCompon…
Sep 1, 2020
8cd191f
add support for C-style comment blocks, print deprecation warning for…
Jul 28, 2020
26b4410
modify PSOAPS.g to parse embedded atoms, add EmbeddedObjectifier.g tr…
Aug 26, 2020
4c857a3
modify the embedded objectifier to perform differentiated embedded ob…
Aug 28, 2020
9865bf8
upgrade ANTLR to version 3.5.2 to allow correct backtracking, needed
Sep 1, 2020
1f1bdd2
add didactic examples of oidful versus oidless embedded atoms in
Sep 10, 2020
2903cae
add example and inline comments for embedded objectifier grammars
mthom Sep 16, 2020
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
4 changes: 2 additions & 2 deletions PSOA2X/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<plugin>
<groupId>org.antlr</groupId>
<artifactId>antlr3-maven-plugin</artifactId>
<version>3.4</version>
<version>3.5.2</version>
<executions>
<execution>
<goals>
Expand Down Expand Up @@ -72,7 +72,7 @@
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr-runtime</artifactId>
<version>3.4</version>
<version>3.5.2</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
Expand Down
123 changes: 62 additions & 61 deletions PSOA2X/src/main/antlr3/imports/PSOAPS.tokens
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,61 +1,62 @@
T__59=59
T__60=60
T__61=61
ALPHA=4
AND=5
BASE=6
COMMENT=7
DEPSIGN=8
DIGIT=9
DOCUMENT=10
ECHAR=11
EOL=12
EQUAL=13
EXISTS=14
EXTERNAL=15
FALSITY=16
FORALL=17
GREATER=18
GROUP=19
HEX=20
IMPLICATION=21
IMPORT=22
INSTANCE=23
IRI=24
IRI_REF=25
IRI_REF_CHARACTERS=26
LESS=27
LITERAL=28
LOCAL=29
LPAR=30
LSQBR=31
MULTI_LINE_COMMENT=32
NAF=33
NAMESPACE=34
NUMBER=35
OR=36
PERCENT=37
PLX=38
PN_CHARS=39
PN_CHARS_BASE=40
PN_CHARS_U=41
PN_LOCAL=42
PN_LOCAL_ESC=43
PN_PREFIX=44
PREFIX=45
PSOA=46
RPAR=47
RSQBR=48
SHORTCONST=49
SLOT=50
SLOT_ARROW=51
STRING=52
SUBCLASS=53
SYMSPACE_OPER=54
TOP=55
TUPLE=56
VAR_ID=57
WHITESPACE=58
'@'=59
'no'=60
'yes'=61
T__60=60
T__61=61
T__62=62
ALPHA=4
AND=5
BASE=6
COMMENT=7
DEPSIGN=8
DIGIT=9
DOCUMENT=10
ECHAR=11
EOL=12
EQUAL=13
EXISTS=14
EXTERNAL=15
FALSITY=16
FORALL=17
GREATER=18
GROUP=19
HEX=20
IMPLICATION=21
IMPORT=22
INSTANCE=23
IRI=24
IRI_REF=25
IRI_REF_CHAR=26
LESS=27
LITERAL=28
LOCAL=29
LPAR=30
LSQBR=31
MULTI_LINE_COMMENT=32
NAF=33
NAMESPACE=34
NUMBER=35
OIDLESSEMBATOM=36
OR=37
PERCENT=38
PLX=39
PN_CHARS=40
PN_CHARS_BASE=41
PN_CHARS_U=42
PN_LOCAL=43
PN_LOCAL_ESC=44
PN_PREFIX=45
PREFIX=46
PSOA=47
RPAR=48
RSQBR=49
SHORTCONST=50
SLOT=51
SLOT_ARROW=52
STRING=53
SUBCLASS=54
SYMSPACE_OPER=55
TOP=56
TUPLE=57
VAR_ID=58
WHITESPACE=59
'@'=60
'no'=61
'yes'=62
2 changes: 1 addition & 1 deletion PSOA2X/src/main/java/org/ruleml/psoa/psoa2x/common/Translator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,4 @@ public Map<String, String> getQueryVarMap()
public List<String> getQueryVars() {
return new ArrayList<String>(m_queryVarMap.keySet());
}
}
}
4 changes: 2 additions & 2 deletions PSOACore/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<plugin>
<groupId>org.antlr</groupId>
<artifactId>antlr3-maven-plugin</artifactId>
<version>3.4</version>
<version>3.5.2</version>
<executions>
<execution>
<goals>
Expand Down Expand Up @@ -68,7 +68,7 @@
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr-runtime</artifactId>
<version>3.4</version>
<version>3.5.2</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
Expand Down
1 change: 1 addition & 0 deletions PSOACore/src/main/antlr3/org/ruleml/psoa/TreeWalkerTemplate.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ external

psoa
: ^(PSOA term? ^(INSTANCE term) tuple* slot*)
| ^(OIDLESSEMBATOM ^(INSTANCE term) tuple* slot*)
;

tuple
Expand Down
8 changes: 8 additions & 0 deletions PSOACore/src/main/antlr3/org/ruleml/psoa/analyzer/KBInfoCollector.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,14 @@ psoa[boolean isAtomicFormula]
if (isAtomicFormula)
addPsoaTermInfo($pred.tree.toStringTree(), arities, oid != null, hasIndepTuple, hasMultiTuple, hasSlot);
}
| ^(OIDLESSEMBATOM ^(INSTANCE term)
((t=tuple { arities.add($t.length); hasIndepTuple = !$t.dep; })
(t=tuple { arities.add($t.length); if (!$t.dep) hasIndepTuple = true; hasMultiTuple = true; } )*)?
(slot { hasSlot = true; })*)
{
if (isAtomicFormula)
addPsoaTermInfo($pred.tree.toStringTree(), arities, false, hasIndepTuple, hasMultiTuple, hasSlot);
}
;

tuple returns [int length, boolean dep]
Expand Down
3 changes: 2 additions & 1 deletion PSOACore/src/main/antlr3/org/ruleml/psoa/analyzer/SchemalessChecker.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,8 @@ external
;

psoa
: ^(PSOA term? ^(INSTANCE term) tuple* (slots+=slot)*)
: ^(OIDLESSEMBATOM ^(INSTANCE term) tuple* slot*)
| ^(PSOA term? ^(INSTANCE term) tuple* (slots+=slot)*)
;

tuple
Expand Down
Loading