Skip to content

Commit

Permalink
Lucia: updates for G7 "Go to the main office."
Browse files Browse the repository at this point in the history
5/21/2021: The previous commit supposedly updated all the Lucia code to match the current Lucia versions. However, it turned out that some of the Grammar/Rosie files were not up to date. This caused sentence G7 to fail in Rosie when it worked fine in Lucia. This commit updates all those files that were not up to date, including deleting lookup-person.soar. Now G7 works great in Rosie too. G8 crashes.
  • Loading branch information
PLindes committed May 21, 2021
1 parent 384d666 commit 0e0cda6
Show file tree
Hide file tree
Showing 16 changed files with 828 additions and 195 deletions.
3 changes: 2 additions & 1 deletion agent/lucia/Grammar/Rosie/ecg/locations.ecg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ schema RosieLocation
roles
rosie-category
name
category // PL 10/8/2020 Needed for Robot stuff
category // PL 10/8/2020 Needed for Robot stuff
root-category // PL 12/29/2020 Needed for Robot stuff

schema Stove
subcase of RosieLocation
Expand Down
2 changes: 2 additions & 0 deletions agent/lucia/Grammar/Rosie/ecg/nouns.ecg
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ construction PANTRY
constraints
self.f.orth <-- "pantry"
meaning: Pantry
constraints
self.m.root-category <-- "pantry1"

construction GARBAGE
subcase of CommonNoun
Expand Down
2 changes: 1 addition & 1 deletion agent/lucia/Grammar/Rosie/ecg/prepositions.ecg
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ construction TO
self.f.orth <-- "to"
meaning
constraints
self.m.name <-- "on1"
self.m.name <-- "to1"

construction NEXT-TO
subcase of Preposition
Expand Down
2 changes: 2 additions & 0 deletions agent/lucia/Grammar/Rosie/ecg/words.ecg
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ construction ONE-pronoun
constraints
self.f.orth <-- "one"
meaning: Object
constraints
self.m.category <-- "object"

construction WE
subcase of Pronoun, Agent
Expand Down
88 changes: 73 additions & 15 deletions agent/lucia/Grammar/Rosie/ecg/x-nouns.ecg
Original file line number Diff line number Diff line change
@@ -1,10 +1,36 @@
// Places
construction CONFERENCE-ROOM
subcase of CommonNoun
form
constraints
self.f.orth <-- "conference room"
// PL 12/21/2020 CONFERENCE-ROOM is being depricated.
// It is replaced by CONFERENCE and TheConferenceRoom
//construction CONFERENCE-ROOM
// subcase of CommonNoun
// form
// constraints
// self.f.orth <-- "conference room"
// meaning: ConferenceRoom

construction CONFERENCE
subcase of Property
form
constraints
self.f.orth <-- "conference"
meaning: PropertyDescriptor
constraints
self.m.class <-- @name
self.m.name <-- "conference1"

construction TheConferenceRoom
subcase of SpecifierNP
constructional
constituents
spec : THE
prop : CONFERENCE
noun : ROOM
meaning: ConferenceRoom
constraints
self.m.name <--> noun.m.schema-name
self.m.category <--> noun.m
self.m.givenness <--> spec.m.givenness
self.m.modifiers <--> prop.m

construction BUILDING
subcase of CommonNoun
Expand All @@ -20,19 +46,51 @@ construction OFFICE
self.f.orth <-- "office"
meaning: Office

construction MAIN-OFFICE
subcase of CommonNoun
form
constraints
self.f.orth <-- "the main office"
// PL 12/21/2020 MAIN-OFFICE is being depricated.
// It is replaced by TheMainOffice
//construction MAIN-OFFICE
// subcase of CommonNoun
// form
// constraints
// self.f.orth <-- "the main office"
// meaning: MainOffice

construction TheMainOffice
subcase of SpecifierNP
constructional
constituents
spec : THE
prop : MAIN
noun : OFFICE
meaning: MainOffice

construction SOAR-OFFICE
subcase of CommonNoun
form
constraints
self.f.orth <-- "the soar office"
self.m.name <--> noun.m.schema-name
self.m.category <--> noun.m
self.m.givenness <--> spec.m.givenness
self.m.modifiers <--> prop.m

// PL 12/21/2020 SOAR-OFFICE is being depricated.
// It is replaced by TheSoarOffice
//construction SOAR-OFFICE
// subcase of CommonNoun
// form
// constraints
// self.f.orth <-- "the soar office"
// meaning: SoarOffice

construction TheSoarOffice
subcase of SpecifierNP
constructional
constituents
spec : THE
prop : SOAR
noun : OFFICE
meaning: SoarOffice
constraints
self.m.name <--> noun.m.schema-name
self.m.category <--> noun.m
self.m.givenness <--> spec.m.givenness
self.m.modifiers <--> prop.m

// Spatial objects
construction HALL
Expand Down
9 changes: 7 additions & 2 deletions agent/lucia/Grammar/Rosie/ecg/x-objects.ecg
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,15 @@ schema Soda
// The old form used with the 209 baseline only
// produced a new object, it was never grounded
// in the world.
// This change makes Robot 004 work.
// This change makes Robot 005 work.
// PL 1/4/2021
// Put the shape assignment back in.
// This makes it worth in both the 209
// and the Robot environments.
subcase of ObjectNotBlock // Changed from Block
constraints
category <-- soda1 // Changed from shape <-- soda1
shape <-- soda1 // Works for 209
category <-- soda1 // Works for Robot

schema Trash
subcase of Block
Expand Down
6 changes: 4 additions & 2 deletions agent/lucia/Grammar/Rosie/soar/locations.soar
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ sp {comprehend-word*evoked-schema*RosieLocation*create
^is <a>
^rosie-category nil
^name nil
^category nil)
^category nil
^root-category nil)
(<a> ^a RosieLocation)
}

Expand All @@ -35,7 +36,8 @@ sp {comprehend-word*evoked-schema*RosieLocation*exists
(<cxn> ^evokes <evoked> -)
(<e-target> ^rosie-category nil
^name nil
^category nil)
^category nil
^root-category nil)
(<a> ^a RosieLocation)
}

Expand Down
15 changes: 15 additions & 0 deletions agent/lucia/Grammar/Rosie/soar/nouns.soar
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,21 @@ sp {comprehend-word*apply*lexical-access*PANTRY-pantry
^target <meaning>)
}

# PANTRY self.m.root-category <-- "pantry1" constraint
sp {comprehend-word*PANTRY-constraint*self-m-root-category*ASSIGN*pantry1
(state <s> ^problem-space comprehend-word
^operator <o>
^cxn <cxn>)
(<o> ^type construction)
(<cxn> ^is.a PANTRY
^orth |pantry|
^m <l-slot1>)
(<l-slot1> ^root-category { <target> <> |pantry1| })
-->
(<l-slot1> ^root-category <target> -
^root-category |pantry1|)
}

# GARBAGE construction
sp {comprehend-word*apply*lexical-access*GARBAGE-garbage
(state <s> ^problem-space comprehend-word
Expand Down
8 changes: 4 additions & 4 deletions agent/lucia/Grammar/Rosie/soar/prepositions.soar
Original file line number Diff line number Diff line change
Expand Up @@ -94,19 +94,19 @@ sp {comprehend-word*apply*lexical-access*TO-to
(<a> ^a TO)
}

# TO self.m.name <-- "on1" constraint
sp {comprehend-word*TO-constraint*self-m-name*ASSIGN*on1
# TO self.m.name <-- "to1" constraint
sp {comprehend-word*TO-constraint*self-m-name*ASSIGN*to1
(state <s> ^problem-space comprehend-word
^operator <o>
^cxn <cxn>)
(<o> ^type construction)
(<cxn> ^is.a TO
^orth |to|
^m <l-slot1>)
(<l-slot1> ^name { <target> <> |on1| })
(<l-slot1> ^name { <target> <> |to1| })
-->
(<l-slot1> ^name <target> -
^name |on1|)
^name |to1|)
}

# NEXT-TO construction
Expand Down
2 changes: 1 addition & 1 deletion agent/lucia/Grammar/Rosie/soar/properties.soar
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ sp {comprehend-word*OFF-constraint*self-m-class*ASSIGN*AT-state
}

# OFF self.m.name <-- "off2" constraint
sp {comprehend-word*OFF-constraint*self-m-name*ASSIGN*not-activated1
sp {comprehend-word*OFF-constraint*self-m-name*ASSIGN*off2
(state <s> ^problem-space comprehend-word
^operator <o>
^cxn <cxn>)
Expand Down
15 changes: 15 additions & 0 deletions agent/lucia/Grammar/Rosie/soar/words.soar
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,21 @@ sp {comprehend-word*ONE-pronoun-constraint*self-features-number*ASSIGN*singular
^number |singular|)
}

# ONE-pronoun self.m.category <-- "object" constraint
sp {comprehend-word*ONE-pronoun-constraint*self-m-category*ASSIGN*object
(state <s> ^problem-space comprehend-word
^operator <o>
^cxn <cxn>)
(<o> ^type construction)
(<cxn> ^is.a ONE-pronoun
^orth |one|
^m <l-slot1>)
(<l-slot1> ^category { <target> <> |object| })
-->
(<l-slot1> ^category <target> -
^category |object|)
}

# WE construction
sp {comprehend-word*apply*lexical-access*WE-we
(state <s> ^problem-space comprehend-word
Expand Down
Loading

0 comments on commit 0e0cda6

Please sign in to comment.