solves #163

ComputerInput.kif

@@ -129,55 +129,6 @@
       (patient ?PGUIDE ?MOVED)
       (instance ?MOVED CorpuscularObject))))
 
-; ===============
-(instance shape BinaryPredicate)
-(subrelation shape property)
-(domain shape 1 Physical)
-(domain shape 2 ShapeAttribute)
-(documentation shape EnglishLanguage "(shape ?OBJECT ?SHAPE) means that the shape of ?OBJECT is ?SHAPE.")
-
-; If a &%Physical object has a property which is an instance of &%ShapeAttribute,
-; then that object has that shape:
-
-(=>
-  (and
-    (property ?OBJ ?SHAPE)
-    (instance ?OBJ Physical)
-    (instance ?SHAPE ShapeAttribute))
-  (shape ?OBJ ?SHAPE))
-
-(instance RoundTwoDimensional ShapeAttribute)
-(documentation RoundTwoDimensional EnglishLanguage "The attribute of being round in two dimensions.")
-
-(instance Elliptical ShapeAttribute)
-(subAttribute Elliptical RoundTwoDimensional)
-(documentation Elliptical EnglishLanguage "The attribute of being elliptical or oval in two dimensions.")
-
-(=>
-  (instance ?SHAPE Oval)
-  (shape ?SHAPE Elliptical))
-
-(instance Circular ShapeAttribute)
-(subAttribute Circular RoundTwoDimensional)
-(documentation Circular EnglishLanguage "The attribute of being circular in two dimensions.")
-
-(=>
-  (instance ?SHAPE Circle)
-  (shape ?SHAPE Circular))
-
-(instance DiskShaped ShapeAttribute)
-(documentation DiskShaped EnglishLanguage "The attribute of being circular in one dimension and flat in the other.")
-(subAttribute DiskShaped Circular)
-(subAttribute DiskShaped Flat)
-
-(subclass SphericalObject Object)
-(documentation SphericalObject EnglishLanguage "An object with the attribute of being spherical.")
-
-(=>
-  (instance ?SPHERE SphericalObject)
-  (shape ?SHAPE Sphere))
-
-; =========================================================
 
 (subclass Keyboard Device)
 (documentation Keyboard EnglishLanguage "A &%Keyboard has a set of keys for typing on to transmit data corresponding to those keys or to cause physical action such as striking or plucking a string, opening a valve, or marking of the selected keys on paper or some other surface.")

Geography.kif

@@ -6404,36 +6404,6 @@ without going through the state of being a &%Liquid.")
         (MeasureFn ?Y Joule))))
   (greaterThan ?Y ?X))
 
-; 3 approximateDiameter (New)
-
-(documentation approximateDiameter EnglishLanguage "The diameter of an object if it were a
-perfect sphere of the same volume")
-
-(documentation approximateDiameter ChineseLanguage "这是假设一个为和它体积相同的完美球体的直径。")
-
-(termFormat EnglishLanguage approximateDiameter "approximate diameter")
-
-(termFormat ChineseLanguage approximateDiameter "近似直径")
-
-(domain approximateDiameter 1 SelfConnectedObject)
-
-(domain approximateDiameter 2 LengthMeasure)
-
-(instance approximateDiameter BinaryPredicate)
-
-(instance approximateDiameter SingleValuedRelation)
-
-(instance approximateDiameter TotalValuedRelation)
-
-(=>
-  (and
-    (approximateDiameter ?O ?L)
-    (sphereRadius ?S (DivisionFn ?L 2))
-    (measure ?S (MeasureFn ?V1 ?VM))
-    (measure ?O (MeasureFn ?V2 ?VM))
-    (instance ?VM VolumeMeasure))
-  (equal ?V1 ?V2))
-
 ; 4 Micrometer (New)
 
 (documentation Micrometer EnglishLanguage "Submultiple of Metre. Symbol:µm. It is a unit

Merge.kif

@@ -7886,6 +7886,10 @@ separates two distinct objects.")
 
 (instance altitude SingleValuedRelation)
 (instance altitude PartialValuedRelation)
+(domain altitude 1 Physical)
+(domain altitude 2 Physical)
+(domain altitude 3 LengthMeasure)
+
 (documentation altitude EnglishLanguage "A &%TernaryPredicate that is
 used to state the &%distance between the &%top of an &%Object and
 another point that is below the &%top of the &%Object (often this
@@ -9605,6 +9609,9 @@ is a &%part of the other.")
 (instance superficialPart IrreflexiveRelation)
 (instance superficialPart TransitiveRelation)
 (instance superficialPart PartialValuedRelation)
+(domain superficialPart 1 Object)
+(domain superficialPart 2 Object)
+
 (documentation superficialPart EnglishLanguage "(&%superficialPart ?OBJ1 ?OBJ2)
 means that ?OBJ1 is a part of ?OBJ2 that has no interior parts of its own
 (or, intuitively, that only overlaps those parts of ?OBJ2 that are
@@ -18729,6 +18736,7 @@ down commentaries ?STR on a defined &%Entity ?ENT")
 (documentation minValue EnglishLanguage "The minimum possible value for a given
 numerical argument of a &%Relation. The second argument is the argument number
 of the relation and the third argument is the minimum value.")
+(instance minValue TernaryRelation)
 (domain minValue 1 Relation)
 (domain minValue 2 Integer)
 (domain minValue 3 Quantity)
@@ -18743,6 +18751,7 @@ of the relation and the third argument is the minimum value.")
 (documentation maxValue EnglishLanguage "The maximum possible value for a given
 numerical argument of a &%Relation. The second argument is the argument number
 of the relation and the third argument is the maximum value.")
+(instance maxValue TernaryRelation)
 (domain maxValue 1 Relation)
 (domain maxValue 2 Integer)
 (domain maxValue 3 Quantity)
@@ -18758,6 +18767,7 @@ of the relation and the third argument is the maximum value.")
 (documentation defaultMinValue EnglishLanguage "The minimum likely value for a given
 numerical argument of a &%Relation. The second argument is the argument number
 of the relation and the third argument is the minimum value.")
+(instance defaultMinValue TernaryRelation)
 (domain defaultMinValue 1 Relation)
 (domain defaultMinValue 2 Integer)
 (domain defaultMinValue 3 Quantity)
@@ -18772,6 +18782,7 @@ of the relation and the third argument is the minimum value.")
 (documentation defaultMaxValue EnglishLanguage "The maximum likely value for a given
 numerical argument of a &%Relation. The second argument is the argument number
 of the relation and the third argument is the minimum value.")
+(instance defaultMaxValue TernaryRelation)
 (domain defaultMaxValue 1 Relation)
 (domain defaultMaxValue 2 Integer)
 (domain defaultMaxValue 3 Quantity)
@@ -18786,6 +18797,7 @@ of the relation and the third argument is the minimum value.")
 (documentation defaultValue EnglishLanguage "The likely value for a given
 numerical argument of a &%Relation. The second argument is the argument number
 of the relation and the third argument is the likely value.")
+(instance defaultValue TernaryRelation)
 (domain defaultValue 1 Relation)
 (domain defaultValue 2 Integer)
 (domain defaultValue 3 Quantity)

Mid-level-ontology.kif

@@ -12845,7 +12845,7 @@ it is possible to transmit light but not through which is likely to be &%Seeing.
     (exists (?EMIT)
       (and
         (instance ?EMIT RadiatingLight)
-        (source ?EMIT ?S)
+        (resource ?EMIT ?S)
         (destination ?EMIT ?OBJ)
         (between ?S ?O ?OBJ)
         (holdsDuring 
@@ -15632,6 +15632,33 @@ disintegrated by geological processes, mixed with humus, the organic remains of
       (part ?Humus ?Soil)
       (part ?Mineral ?Soil))))
 
+
+; 3 approximateDiameter (New)
+
+(documentation approximateDiameter EnglishLanguage "The diameter of an object if it were a
+perfect sphere of the same volume")
+(documentation approximateDiameter ChineseLanguage "这是假设一个为和它体积相同的完美球体的直径。")
+
+(termFormat EnglishLanguage approximateDiameter "approximate diameter")
+(termFormat ChineseLanguage approximateDiameter "近似直径")
+
+(domain approximateDiameter 1 SelfConnectedObject)
+(domain approximateDiameter 2 LengthMeasure)
+
+(instance approximateDiameter BinaryPredicate)
+(instance approximateDiameter SingleValuedRelation)
+(instance approximateDiameter TotalValuedRelation)
+
+(=>
+  (and
+    (approximateDiameter ?O ?L)
+    (sphereRadius ?S (DivisionFn ?L 2))
+    (measure ?S (MeasureFn ?V1 ?VM))
+    (measure ?O (MeasureFn ?V2 ?VM))
+    (instance ?VM VolumeMeasure))
+  (equal ?V1 ?V2))
+
+
 (subclass Clay Soil)
 (documentation Clay EnglishLanguage "&%Clay is fine-grained soil consisting of mineral
 particles, not necessarily clay minerals. Smaller than &%Silt (in the Wentworth Scale),
@@ -20412,33 +20439,6 @@ and eat.  Some restaurants may also offer entertainment.")
       (instance ?EV EducationalProcess)
       (patient ?EV ?X))))
 
-(subclass SubwaySystem RailTransportationSystem)
-(documentation SubwaySystem EnglishLanguage "Any &%RailTransportationSystem that runs 
-exclusively through &%Tunnels.")
-
-(=>
-  (and
-    (instance ?S SubwaySystem)
-    (routeInSystem ?P ?S))
-  (instance ?P Tunnel))
-
-(=>
-  (instance ?X SubwaySystem)
-  (exists (?SURF)
-    (and
-      (surface ?SURF GeographicArea)
-      (orientation ?X ?SURF Below))))
-
-(=>
-  (instance ?X SubwaySystem)
-  (hasPurpose ?X
-    (exists (?EV ?P)
-      (and
-        (instance ?EV Transportation)
-        (instance ?P Human)
-        (patient ?EV ?P)
-        (eventLocated ?EV ?X)))))
-
 (instance Tourist SocialRole)
 (documentation Tourist EnglishLanguage "A tourist is a
 person who is travelling to a place primarily for reasons of
@@ -23452,6 +23452,55 @@ with dirt, dust or grime")
 
 (contraryAttribute Dirty Clean)
 
+
+(instance shape BinaryPredicate)
+(subrelation shape property)
+(domain shape 1 Physical)
+(domain shape 2 ShapeAttribute)
+(documentation shape EnglishLanguage "(shape ?OBJECT ?SHAPE) means that the shape of ?OBJECT is ?SHAPE.")
+
+; If a &%Physical object has a property which is an instance of &%ShapeAttribute,
+; then that object has that shape:
+
+(=>
+  (and
+    (property ?OBJ ?SHAPE)
+    (instance ?OBJ Physical)
+    (instance ?SHAPE ShapeAttribute))
+  (shape ?OBJ ?SHAPE))
+
+(instance RoundTwoDimensional ShapeAttribute)
+(documentation RoundTwoDimensional EnglishLanguage "The attribute of being round in two dimensions.")
+
+(instance Elliptical ShapeAttribute)
+(subAttribute Elliptical RoundTwoDimensional)
+(documentation Elliptical EnglishLanguage "The attribute of being elliptical or oval in two dimensions.")
+
+(=>
+  (instance ?SHAPE Oval)
+  (shape ?SHAPE Elliptical))
+
+(instance Circular ShapeAttribute)
+(subAttribute Circular RoundTwoDimensional)
+(documentation Circular EnglishLanguage "The attribute of being circular in two dimensions.")
+
+(=>
+  (instance ?SHAPE Circle)
+  (shape ?SHAPE Circular))
+
+(instance DiskShaped ShapeAttribute)
+(documentation DiskShaped EnglishLanguage "The attribute of being circular in one dimension and flat in the other.")
+(subAttribute DiskShaped Circular)
+(subAttribute DiskShaped Flat)
+
+(subclass SphericalObject Object)
+(documentation SphericalObject EnglishLanguage "An object with the attribute of being spherical.")
+
+(=>
+  (instance ?SPHERE SphericalObject)
+  (shape ?SHAPE Sphere))
+
+
 (subclass DataStorageDevice Device)
 (documentation DataStorageDevice EnglishLanguage "An &%instance of
 &%DataStorageDevice is a &%Device intended to be used for storing
@@ -28709,7 +28758,7 @@ their &%birthplace or where the &%Residence they &%inhabit is &%located.")
       (and
         (instance ?P Eating)
         (agent ?P ?H)
-        (termporallyOverlaps ?T (WhenFn ?P))))))
+        (overlapsTemporally ?T (WhenFn ?P))))))
 
 (instance Dieting RelationalAttribute)
 (documentation Dieting EnglishLanguage "A state of reducing one's normal or desired intake of &%Food.")

Transportation.kif

@@ -312,6 +312,33 @@ other than broad, dual, narrow, or standard gauge is the &%LengthMeasure
       (instance ?RAILWAY Railway)
       (located ?RAILWAY ?AREA))))
 
+(subclass SubwaySystem RailTransportationSystem)
+(documentation SubwaySystem EnglishLanguage "Any &%RailTransportationSystem that runs 
+exclusively through &%Tunnels.")
+
+(=>
+  (and
+    (instance ?S SubwaySystem)
+    (routeInSystem ?P ?S))
+  (instance ?P Tunnel))
+
+(=>
+  (instance ?X SubwaySystem)
+  (exists (?SURF)
+    (and
+      (surface ?SURF GeographicArea)
+      (orientation ?X ?SURF Below))))
+
+(=>
+  (instance ?X SubwaySystem)
+  (hasPurpose ?X
+    (exists (?EV ?P)
+      (and
+        (instance ?EV Transportation)
+        (instance ?P Human)
+        (patient ?EV ?P)
+        (eventLocated ?EV ?X)))))
+
 (subclass Railway LandTransitway) ;; &%Transitway is defined in Part II.
 (subclass Railway StationaryArtifact)
 (documentation Railway EnglishLanguage "&%Railway is the subclass of