more revision restrict greaterThan etc. to only take a number arguement

Weather.kif

@@ -353,13 +353,17 @@ related to wind speed ranges.")
     (eventLocated ?W ?AREA)
     (believes ?A 
       (property ?W ?BN))
-    (speedScaleAttributeMinMax ?BN ?MIN ?MAX)) 
+    (speedScaleAttributeMinMax ?BN 
+      (MeasureFn ?MIN ?U)
+      (MeasureFN ?MAX ?U))
+    (instance ?U UnitOfMeasure))
   (exists (?SPEED)
     (and
       (greaterThanOrEqualTo ?SPEED ?MIN)
       (lessThanOrEqualTo ?SPEED ?MAX)    
       (believes ?A    
-        (surfaceWindSpeed ?AREA ?SPEED)))))
+        (surfaceWindSpeed ?AREA 
+          (MeasureFn ?SPEED ?U))))))
 
 (documentation BeaufortNumber0 Englishlanguage "The estimated &%surfaceWindSpeed for 
 &%BeaufortNumber0 is less than 1 &%MilesPerHour (2 km/h).")
@@ -2089,13 +2093,16 @@ have wind gusts ranging between 65 to 85 mph,and the severest &%Tornades (EF5)
     (eventLocated ?T ?AREA)
     (believes ?A
       (property ?T ?EF))
-    (speedScaleAttributeMinMax ?EF ?MIN ?MAX))
+    (speedScaleAttributeMinMax ?EF 
+      (MeasureFn ?MIN MilesPerHour)
+      (MeasureFn ?MAX MilesPerHour)))
   (exists (?GUST)
     (and
       (greaterThanOrEqualTo ?GUST ?MIN)
       (lessThanOrEqualTo ?GUST ?MAX)   
       (believes ?A
-        (equal ?GUST
+        (equal 
+          (MeasureFn ?GUST MilesPerHour)
           (ThreeSecondGustSpeedFn ?AREA
             (WhenFn ?T)))))))
 
@@ -2114,13 +2121,17 @@ have wind gusts ranging between 65 to 85 mph,and the severest &%Tornades (EF5)
 (instance speedScaleAttributeMinMax TernaryRelation)
 
 (=>
-  (speedScaleAttributeMinMax ?ATTR ?MIN ?MAX) 
+  (and
+    (speedScaleAttributeMinMax ?ATTR 
+      (MeasureFn ?MIN ?U)
+      (MeasureFn ?MAX ?U))
+    (instance ?U UnitOfMeasure))
   (exists (?X ?SPEED)
     (and
       (instance ?X Motion)
       (property ?X ?ATTR)
-      (instance ?SPEED FunctionQuantity)
-      (measure ?X ?SPEED)
+      (measure ?X 
+        (MeasureFn ?SPEED ?U))
       (greaterThanOrEqualTo ?SPEED ?MIN)
       (lessThanOrEqualTo ?SPEED ?MAX))))
 
@@ -2351,13 +2362,17 @@ of a &%Hurricane based on the highest wind speed averaged over a one-minute inte
     (eventLocated ?H ?AREA)
     (believes ?A
       (property ?H ?SS))
-    (speedScaleAttributeMinMax ?SS ?MIN ?MAX))
+    (speedScaleAttributeMinMax ?SS 
+      (MeasureFn ?MIN ?U)
+      (MeasureFn ?MAX ?U))
+    (instance ?U UnitOfMeasure))
   (exists (?WIND)
     (and
       (greaterThanOrEqualTo ?WIND ?MIN)
       (lessThanOrEqualTo ?WIND ?MAX)
       (believes ?A
-        (equal ?WIND
+        (equal 
+          (MeasureFn ?WIND ?U)
           (Mean1MinuteWindSpeedFn ?AREA
             (WhenFn ?H)))))))
 
@@ -2685,7 +2700,10 @@ during &%NightTime. Visibility during &%DayTime can also be called the meteorolo
 (termFormat ChineseLanguage visibilityInMeteorology "气象学能见度")
 
 (=>
-  (visibilityInMeteorology ?Area ?Time ?Distance)
+  (and
+    (visibilityInMeteorology ?Area ?Time 
+      (MeasureFn ?Distance ?U))
+    (instance ?U UnitOfMeasure))
   (not
     (exists (?Observe ?A ?B ?D2)
       (and
@@ -2696,14 +2714,17 @@ during &%NightTime. Visibility during &%DayTime can also be called the meteorolo
         (during 
           (WhenFn ?Observe) ?Time)
         (eventLocated ?Observe ?Area)
-        (distance ?A ?B ?D2)
+        (distance ?A ?B 
+          (MeasureFn ?D2 ?U))
         (greaterThan ?D2 ?Distance)))))
 
 (=>
   (and
-    (visibilityInMeteorology ?Area ?Time ?Distance)
+    (visibilityInMeteorology ?Area ?Time 
+      (MeasureFn ?Distance ?U))
+    (instance ?U UnitOfMeasure)
     (instance ?Time DayTime)
-    (instance ?Observe Looking)
+    (instance ?Observe Looking) 
     (instance ?B Object)
     (color ?B Black)
     (agent ?Observe ?A)
@@ -2713,13 +2734,17 @@ during &%NightTime. Visibility during &%DayTime can also be called the meteorolo
     (during 
       (WhenFn ?Observe) ?Time)
     (instance ?B Object))
-  (and
-    (distance ?A ?B ?D2)
-    (greaterThan ?Distance ?D2)))
+  (exists (?D2)
+    (and
+      (distance ?A ?B 
+        (MeasureFn ?D2 ?U))
+    (greaterThan ?Distance ?D2))))
 
 (=>
   (and
-    (visibilityInMeteorology ?Area ?Time ?Distance)
+    (visibilityInMeteorology ?Area ?Time 
+      (MeasureFn ?Distance ?U))
+    (instance ?U UnitOfMeasure)
     (instance ?Time NightTime)
     (instance ?Observe Looking)
     (instance ?B Region)
@@ -2732,9 +2757,11 @@ during &%NightTime. Visibility during &%DayTime can also be called the meteorolo
     (during 
       (WhenFn ?Observe) ?Time)
     (instance ?B Object))
-  (and
-    (distance ?A ?B ?D2)
-    (greaterThan ?Distance ?D2)))
+  (exists (?D2)
+    (and
+      (distance ?A ?B 
+        (MeasureFn ?D2 ?U))
+      (greaterThan ?Distance ?D2))))
 
 ; 3 Frosting (New)
 (documentation Frosting EnglishLanguage "&%Frosting is the &%Process by which a coating or