From 4fb7d360be7b2249509b17ad182a6efd63efc5f6 Mon Sep 17 00:00:00 2001 From: Jennifer Pease Date: Fri, 15 Mar 2024 15:58:57 -0700 Subject: [PATCH] a few corrections and continue to work on ShapeAttributes --- Cars.kif | 14 +++++++----- Geography.kif | 6 ++--- Merge.kif | 2 +- Mid-level-ontology.kif | 37 +++++++++++++------------------ MilitaryDevices.kif | 2 +- development/Useful-terms_2023.kif | 4 ++-- 6 files changed, 31 insertions(+), 34 deletions(-) diff --git a/Cars.kif b/Cars.kif index 2af304e2..13d4ace1 100644 --- a/Cars.kif +++ b/Cars.kif @@ -3071,10 +3071,11 @@ and often used in the construction of &%ElectricalTransformers.") (=> (instance ?WC WireCoil) - (exists (?P) + (exists (?P ?C) (and (part ?P ?WC) - (attribute ?P ClosedTwoDimensionalFigure)))) + (attribute ?P ?C) + (instance ?C ClosedTwoDimensionalFigure)))) (subclass ElectricalTransformer Transformer) (termFormat EnglishLanguage ElectricalTransformer "electrical transformer") @@ -3116,15 +3117,16 @@ as the ratio of the resulting voltages.") (=> (coilCount ?WC ?N) - (exists (?C) + (exists (?C ?C2F) (and (instance ?C Collection) - (memberCount ?C ?N) + (memberCount ?C ?N) (forall (?M) (=> (member ?M ?C) (and - (attribute ?M ClosedTwoDimensionalFigure) + (attribute ?M ?C2F) + (instance ?C2F ClosedTwoDimensionalFigure) (part ?M ?WC) (not (exists (?M2) @@ -3132,7 +3134,7 @@ as the ratio of the resulting voltages.") (overlapsSpatially ?M2 ?M) (member ?M2 ?C)))))))))) -(subclass IgnitionCoil ElectricalTransformer) +(subclass IgnitionCoil ElectricalTransformer) (termFormat EnglishLanguage IgnitionCoil "ignition coil") (documentation IgnitionCoil EnglishLanguage "An &%ElectricalTransformer designed to take 12 &%Volt power from the &%Battery of an &%Automobile and convert it diff --git a/Geography.kif b/Geography.kif index 581c57f5..26183a9d 100644 --- a/Geography.kif +++ b/Geography.kif @@ -4395,9 +4395,9 @@ ample supply of loose sand. Dunes are generally defined as greater than 7 cm tal (termFormat EnglishLanguage Dune "dune") (=> - (instance ?D Dune) - (material ?D Sand)) - + (material Dune ?S) + (instance ?S Sand)) + (=> (and (instance ?D Dune) diff --git a/Merge.kif b/Merge.kif index c7a54863..5c3175c7 100755 --- a/Merge.kif +++ b/Merge.kif @@ -11256,7 +11256,7 @@ liquid or frozen state.") (subclass Wind GasMotion) (documentation Wind EnglishLanguage "Any &%Motion of &%Air.") -(instance Windy Attibute) +(instance Windy Attribute) (documentation Windy EnglishLanguage "An &%Attribute indicating that at a given time and place the &%surfaceWindSpeed is greater than 20mph.") (termFormat EnglishLanguage Windy "windy") diff --git a/Mid-level-ontology.kif b/Mid-level-ontology.kif index f8a17620..79c73577 100755 --- a/Mid-level-ontology.kif +++ b/Mid-level-ontology.kif @@ -4900,16 +4900,18 @@ exclusively of straight lines, i.e. &%OneDimensionalFigures.") (KappaFn ?SIDE (sideOfFigure ?SIDE ?TRIANGLE))) 3)) -(subclass RightTriangle Triangle) +(instance RightTriangle Triangle) (documentation RightTriangle EnglishLanguage "Any &%Triangle that contains a &%RightAngle.") (=> - (instance ?T RightTriangle) - (exists (?A) - (and - (instance ?A RightAngle) - (angleOfFigure ?A ?T)))) - + (and + (equal ?T RightTriangle) + (instance ?T Triangle)) + (exists (?A) + (and + (instance ?A RightAngle) + (angleOfFigure ?A ?T)))) + (subclass Quadrilateral Polygon) (documentation Quadrilateral EnglishLanguage "Any four-sided &%Polygon.") @@ -4920,27 +4922,20 @@ exclusively of straight lines, i.e. &%OneDimensionalFigures.") (KappaFn ?SIDE (sideOfFigure ?SIDE ?QUAD))) 4)) -(subclass Rectangle Quadrilateral) +(instance Rectangle Quadrilateral) (documentation Rectangle EnglishLanguage "Any &%Quadrilateral whose angles are all &%RightAngles.") (=> - (instance ?RECTANGLE Rectangle) - (exists (?ANGLE) - (and - (angleOfFigure ?ANGLE ?RECTANGLE) - (instance ?ANGLE RightAngle)))) + (angleOfFigure ?ANGLE Rectangle) + (instance ?ANGLE RightAngle)) -(subclass Square Rectangle) +(subAttribute Square Rectangle) (documentation Square EnglishLanguage "Any &%Rectangle whose sides are all equal.") (=> - (instance ?SQUARE Square) - (exists (?LENGTH) - (forall (?SIDE) - (=> - (sideOfFigure ?SIDE ?SQUARE) - (lineMeasure ?SIDE ?LENGTH))))) + (sideOfFigure ?SIDE Square) + (lineMeasure ?SIDE ?LENGTH)) (documentation DiameterFn EnglishLanguage "(DiameterFn ?CIRCLE) denotes the length of the diameter of the &%Circle ?CIRCLE.") @@ -4970,7 +4965,7 @@ of the &%Circle ?CIRCLE.") (geometricDistance ?P2 ?P ?R)) (equal (RadiusFn ?C) ?R)) -(subclass CircleSector ClosedTwoDimensionalFigure) +(instance CircleSector ClosedTwoDimensionalFigure) (documentation CircleSector EnglishLanguage "A slice of a &%Circle, i.e. any &%ClosedTwoDimensionalFigure which consists of two Radii and the arc of the &%Circle that they bound.") diff --git a/MilitaryDevices.kif b/MilitaryDevices.kif index d7834b54..89bf62ce 100644 --- a/MilitaryDevices.kif +++ b/MilitaryDevices.kif @@ -2093,7 +2093,7 @@ land and water") (termFormat EnglishLanguage Barricade "barricade") (termFormat EnglishLanguage AmphibiousVehicle "amphibious vehicle") -(sublass Shrapnel Object) +(subclass Shrapnel Object) (documentation Shrapnel EnglishLanguage "Parts of a &%Bomb that are designed to spread out from the explosion and cause damage to &%Humans and objects.") (termFormat EnglishLanguage Shrapnel "shrapnel") diff --git a/development/Useful-terms_2023.kif b/development/Useful-terms_2023.kif index 9a5d6dc9..0f941ca3 100644 --- a/development/Useful-terms_2023.kif +++ b/development/Useful-terms_2023.kif @@ -604,10 +604,10 @@ measuring the distance travelled by a vehicle, such as a car.[Wikipedia]") ;; reset measuring device (instance ResetMeasuringDevice RelationalAttribute) -(documentation resetMeasuringDevice EnglishLanguage "&%ResetMeasuringDevice is +(documentation ResetMeasuringDevice EnglishLanguage "&%ResetMeasuringDevice is an attribute which signified that the &%measurementReading of a &%MeasuringDevice has been set to zero.") -(termFormat EnglishLanguage resetMeasuringDevice "reset measuring device") +(termFormat EnglishLanguage ResetMeasuringDevice "reset measuring device") (=> (and