revision on geometricfigures

Mid-level-ontology.kif

@@ -4841,34 +4841,31 @@ produced by rotating a &%RightTriangle around its &%RightAngle.")
 all &%GeometricPoints that make up the &%Cylinder are equidistant from a
 &%OneDimensionalFigure, known as the axis of the &%Cylinder.")
 
-(subclass ObliqueAngle TwoDimensionalAngle)
+;; Jennie Pease 3rd April 2024
+;; Revised angles to instances
+;;
+(instance ObliqueAngle TwoDimensionalAngle)
 (documentation ObliqueAngle EnglishLanguage "Any &%TwoDimensionalAngle that has an
 &%angularMeasure that is greater than 90 &%AngularDegrees.")
 
 (=>
-  (and
-    (instance ?A ObliqueAngle)
-    (angularMeasure ?A ?N))
+  (angularMeasure ObliqueAngle ?N)
   (greaterThan ?N 90.0))
 
-
-(subclass RightAngle TwoDimensionalAngle)
+(instance RightAngle TwoDimensionalAngle)
 (documentation RightAngle EnglishLanguage "Any &%TwoDimensionalAngle that has the
 &%angularMeasure of 90 &%AngularDegrees.")
 
 (=>
-   (instance ?A RightAngle)
-   (angularMeasure ?A 90.0))
+  (angularMeasure RightAngle ?N)
+  (equal ?N 90.0))
 
-(subclass AcuteAngle TwoDimensionalAngle)
+(instance AcuteAngle TwoDimensionalAngle)
 (documentation AcuteAngle EnglishLanguage "Any &%TwoDimensionalAngle that has an
 &%angularMeasure that is less than 90 &%AngularDegrees.")
-(partition TwoDimensionalAngle RightAngle ObliqueAngle AcuteAngle)
 
 (=>
-   (and
-      (instance ?A AcuteAngle)
-      (angularMeasure ?A ?N))
+  (angularMeasure AcuteAngle ?N)
    (lessThan ?N 90.0))
 
 (subclass Polygon ClosedTwoDimensionalFigure)
@@ -4890,21 +4887,26 @@ exclusively of straight lines, i.e. &%OneDimensionalFigures.")
       (sideOfFigure ?SIDE ?POLYGON)
       (geometricPart ?SIDE ?POLYGON))))
 
-(subclass Triangle Polygon)
+(instance Triangle Polygon)
 (documentation Triangle EnglishLanguage "Any three-sided &%Polygon.")
 
 (equal
   (CardinalityFn
     (KappaFn ?SIDE
-      (sideOfFigure ?SIDE Triangle))) 3))
+      (sideOfFigure ?SIDE Triangle))) 3)
 
-(instance RightTriangle Triangle)
+(subAttribute RightTriangle Triangle)
 (documentation RightTriangle EnglishLanguage "Any &%Triangle that contains a &%RightAngle.")
-
-(exists (?A)
+    
+(=>
   (and
-    (instance ?A RightAngle)
-    (angleOfFigure ?A Triangle)))
+    (instance ?T Polygon)
+    (equal ?T RightTriangle))
+  (exists (?A)
+    (and
+      (instance ?A TwoDimensionalAngle)
+      (angleOfFigure ?A ?T)
+      (equal ?A RightAngle))))
 
 (subclass Quadrilateral Polygon)
 (documentation Quadrilateral EnglishLanguage "Any four-sided &%Polygon.")
@@ -4920,9 +4922,7 @@ exclusively of straight lines, i.e. &%OneDimensionalFigures.")
 (documentation Rectangle EnglishLanguage "Any &%Quadrilateral whose angles are all
 &%RightAngles.")
 
-(=>
-  (angleOfFigure ?ANGLE Rectangle)
-  (instance ?ANGLE RightAngle))
+(angleOfFigure RightAngle Rectangle)
 
 (subAttribute Square Rectangle)
 (documentation Square EnglishLanguage "Any &%Rectangle whose sides are all equal.")

VirusProteinAndCellPart.kif

@@ -401,7 +401,7 @@ molecules.")
 
 (instance cellShape BinaryPredicate)
 (subrelation cellShape shape)
-(domainSubclass cellShape 1 Cell)
+(domain cellShape 1 Cell)
 (domain cellShape 2 ShapeAttribute)
 (format EnglishLanguage cellShape "%1 cells are &%shaped like a %2")
 

domainEnglishFormat.kif

@@ -54860,8 +54860,8 @@
 ;; (termFormat GermanLanguage Squall "Bö")
 
 (termFormat EnglishLanguage Square "square")
-(termFormat ChineseTraditionalLanguage Square "廣場")
-(termFormat ChineseLanguage Square "广场")
+(termFormat ChineseTraditionalLanguage Square "正方形")
+(termFormat ChineseLanguage Square "正方形")
 ;; (termFormat JapaneseLanguage Square "平方")
 ;; (termFormat GermanLanguage Square "Quadrat")