more contribution on mixing classes and instances

Cars.kif

@@ -1675,7 +1675,7 @@ of &%Wood in a low &%Oxygen environment.")
   (instance ?CH Charcoal)
   (exists (?C ?W)
     (and
-      (subclass ?C Combustion)
+      (instance ?C Combustion)
       (instance ?W Wood)
       (result ?C ?CH)
       (resource ?C ?W))))

ComputerInput.kif

@@ -2268,9 +2268,9 @@ may display the %&UIElement in a different manner signifying that it is selected
     (patient ?ACT ?GUIE)
     (instance ?GUIE GUIElement))
   (and
-    (holdsDuring (EndFn ?SELECT) 
+    (holdsDuring (EndFn ?ACT) 
       (hasGUEState ?GUIE GUE_ActiveState))
-    (holdsDuring (StartFn ?SELECT) 
+    (holdsDuring (BeginFn ?ACT) 
       (not (hasGUEState ?GUIE GUE_ActiveState)))))
 
 (subclass SelectingComputerSubmenu ActivatingUIElement)

ComputingBrands.kif

@@ -91,8 +91,10 @@
 (canRunOn AppleIOS AppleIPhone)
 
 (=>
-  (subclass ?OS AppleIOS)
-  (creator AppleComputerCorporation ?OS))
+  (and
+    (subclass ?OS AppleIOS)
+    (instance ?INST ?OS))
+  (creator AppleComputerCorporation ?INST))
 
 ;; information from https://en.wikipedia.org/wiki/List_of_Apple_operating_systems
 

CountriesAndRegions.kif

@@ -870,7 +870,7 @@ borders on the &%GulfOfMexico.")
 (documentation Alaska EnglishLanguage "The largest state in the &%UnitedStates.")
 (=>
    (and
-      (subclass ?UNIT AreaMeasure)
+      (instance ?UNIT AreaMeasure)
       (measure Alaska (MeasureFn ?NUMBER1 ?UNIT))
       (measure ?STATE (MeasureFn ?NUMBER2 ?UNIT))
       (instance ?STATE AmericanState)

Dining.kif

@@ -892,7 +892,7 @@ on judging an &%Object instead of some physical process between opponents")
         (instance ?PROC Judging)
         (agent ?PROC ?JUDGE)
         (patient ?PROC ?OBJ)
-        (result ?PROC (subjectiveAttribute ?OBJ ?ATTR ?JUDGE))
+        (result ?PROC (subjectiveAttribute ?OBJ ?AFTR ?JUDGE))
         (subProcess ?PROC ?CONTEST)))))
 
 ;; axiom for contest attribute Won
@@ -924,7 +924,7 @@ process ?PROCESS during the time indicated by ?TIMEINT")
   (exists (?TIME)
     (and
       (instance ?TIME ?TIMEINT)
-      (holdsDuring ?TIMEINT
+      (holdsDuring ?TIME
         (capability ?PROCESS ?ROLE ?OBJ)))))
 
 ;; ----------------------------------------------------------------------------

Economy.kif

@@ -3730,7 +3730,7 @@ of &%TimeIntervals that are &%fiscalYearPeriods of the &%Organization or
 ;; FUNCTION:
 (instance FiscalYearStartingFn BinaryFunction)
 (domain FiscalYearStartingFn 1 Agent)
-(domainSubclass FiscalYearStartingFn 2 Year)
+(domain FiscalYearStartingFn 2 Year)
 (range FiscalYearStartingFn TimeInterval)
 
 (documentation FiscalYearStartingFn EnglishLanguage "(&%FiscalYearStartingFn ?PLACE ?YEAR) 
@@ -3764,11 +3764,12 @@ during the calendar &%Year indicated by ?YEAR.")
     (equal ?FY (FiscalYearStartingFn ?PLACE ?YEAR))
     (fiscalYearPeriod ?PLACE ?PERIOD)
     (instance ?FY ?PERIOD))
-  (exists (?DAY)
+  (exists (?DAY ?INST)
     (and
       (instance ?DAY Day)
       (starts ?DAY ?FY)
-      (temporalPart ?DAY ?YEAR))))
+      (instance ?INST ?YEAR)
+      (temporalPart ?DAY ?INST))))
 
 ;; ==========================================================================
 

Geography.kif

@@ -1432,7 +1432,7 @@ subclass of &%ClimateZone which the coldest month averaging between
 ;; coldest monthly average temperature -3 C < and > 18 C
 (=>
   (climateTypeInArea ?AREA TemperateClimateZone)
-  (exists (?MO ?MOUNT)
+  (exists (?MO ?AMOUNT)
     (and
       (instance ?MO Month)
       (averageTemperatureForPeriod ?AREA ?MO 
@@ -3113,7 +3113,7 @@ Their Transboundary Fluxes" AirPollution-VolatileOrganicCompoundsProtocol)
 (instance AntarcticTreaty Agreement)
 (conventionalLongName "Antarctic Treaty" AntarcticTreaty)
 (agreementAdoptionDate AntarcticTreaty (DayFn 1 (MonthFn December (YearFn 1959))))
-(agreementEffectiveDate AntarcticTreaty (DayFn 23 (MonthFn June (YearFn 1961))))
+(agreementEffectiveDate AntarcticTreaty (instance ?D (DayFn 23 (MonthFn June (YearFn 1961)))))
 
 ;; consultative (voting) members: (claimants) Argentina, Australia,
 ;; Chile, France, NewZealand, Norway, UnitedKingdom; (nonclaimants)

Government.kif

@@ -544,8 +544,10 @@ that the &%GeopoliticalArea ?AREA achieved its sovereignty on the date
 (&%MonthFn &%August (&%YearFn 1919)))).") 
 
 (=>
-  (independenceDate ?COUNTRY1 ?DATE)
-  (holdsDuring (FutureFn ?DATE)
+  (and
+    (independenceDate ?COUNTRY1 ?DATE)
+    (instance ?INST ?DATE))
+  (holdsDuring (FutureFn ?INST)
     (not 
       (exists (?COUNTRY2)
         (dependentGeopoliticalArea ?COUNTRY1 ?COUNTRY2)))))
@@ -774,7 +776,8 @@ but it is in effect at least throughout the time indicated by ?DATE.")
     (instance ?CONST (ConstitutionFn ?COUNTRY))
     (instance ?COUNTRY Nation)
     (equal ?GOV (GovernmentFn ?COUNTRY))
-    (agreementEffectiveDuring ?CONST (WhenFn ?GOV))
+    (instance (WhenFn ?GOV) ?CLASS)
+    (agreementEffectiveDuring ?CONST ?CLASS)
     (subProposition ?PART ?CONST)
     (containsInformation ?FORMULA ?PART))
   (holdsObligation ?FORMULA ?GOV))
@@ -2759,7 +2762,12 @@ Non-Governmental Institutions (NGOs), and other transnational agents.")
 (conventionalLongName "Agency for the French-Speaking Community" AgencyForTheFrenchSpeakingCommunity)
 (abbreviation "ACCT" AgencyForTheFrenchSpeakingCommunity)
 (formerName "Agency for Cultural and Technical Cooperation" AgencyForTheFrenchSpeakingCommunity)
-(holdsDuring (ImmediateFutureFn (YearFn 1996)) (conventionalLongName "Agency for the French-Speaking Community" AgencyForTheFrenchSpeakingCommunity))
+(holdsDuring 
+  (ImmediateFutureFn ?TIME)
+  (and
+    (instance ?TIME (YearFn 1996)) 
+    (conventionalLongName "Agency for the French-Speaking Community" AgencyForTheFrenchSpeakingCommunity)))
+
 (dateEstablished AgencyForTheFrenchSpeakingCommunity (DayFn 20 (MonthFn March (YearFn 1970))))
 
 (instance AgencyForTheProhibitionOfNuclearWeaponsInLatinAmericaAndTheCaribbean OrganizationOfNations)

Languages.kif

@@ -14706,7 +14706,7 @@ defined in SUMO.")
   (codeMapping ISO-639-1 ?TOKEN ?X)
   (or
     (instance ?X HumanLanguage)
-    (subclass ?X HumanLanguage)))
+    (instance ?X (subclass ?CLASS HumanLanguage))))
 
 (=>
   (codeMapping ISO-639-1 ?TOKEN ?X)

MilitaryProcesses.kif

@@ -2036,9 +2036,9 @@ IO, CA operations, UW and/or FID.")
       (and
         (agent ?CO ?AGENT)
         (enemy ?AGENT ?ENEMY)
-        (instance ?OP Terrorism)
-        (agent ?OP ?ENEMY)
+        (subclass ?CLASS Terrorism)
         (instance ?OP ?CLASS)
+        (agent ?OP ?ENERY)
         (prevents ?CO ?CLASS)))))
 
 (subclass CTIntelligenceOperation CounterTerrorism)
@@ -2178,10 +2178,10 @@ from the enemy.")
       (and
         (agent ?CO ?AGENT)
         (enemy ?AGENT ?ENEMY)
-        (instance ?OP MilitaryOperation)
+        (subclass ?CLASS MilitaryOperation)
         (instance ?OP ?CLASS)
         (agent ?OP ?ENEMY)
-        (prevent ?CP ?CLASS)))))
+        (prevent ?CO ?CLASS)))))
 
 (subclass CounterReconnaissance CounterOperation)
 (documentation CounterReconnaissance EnglishLanguage "All measures taken to prevent
@@ -2191,17 +2191,18 @@ hostile observation of a force, area, or place.")
 ;; enemy Reconnaissance operations
 
 (=>
-  (and
-    (instance ?CO CounterReconnaissance)
-    (agent ?CO ?AGENT))
-  (exists (?ENEMY ?OP)
-    (and
-      (enemy ?AGENT ?ENEMY)
-      (agent ?OP ?ENEMY)
-      (instance ?OP ReconnaissanceOperation)
-      (hasPurpose ?CO
-        (prevents ?CO ?OP)))))
+  (instance ?CO CounterReconnaissance)
+  (hasPurpose ?CO
+    (exists (?AGENT ?ENEMY ?OP ?CLASS)
+      (and
+        (agent ?CO ?AGENT)
+        (enemy ?AGENT ?ENEMY)
+        (subclass ?CLASS ReconnaissanceOperation)
+        (instance ?OP ?CLASS)
+        (agent ?OP ?ENEMY)
+        (prevent ?CO ?CLASS)))))
 
+
 (subclass CivilAffairsOperation JointOperation)
 (documentation CivilAffairsOperation EnglishLanguage "Civil Affairs Operations
 (CAO). These consist of CA activities and other tasks conducted by CA

UXExperimentalTerms.kif

@@ -2839,18 +2839,18 @@ description of the &%patient of the listing.")
 
 (=>
   (instance ?TEAM CrossFunctionalTeam)
-  (exists (?SKILL ?MEMBER1 ?MEMBER2)
+  (exists (?SKILL ?MEMBER1 ?MEMBER2 ?INST)
     (and
-      (instance ?SKILL Process)
+      (subclass ?SKILL Process)
       (instance ?MEMBER1 Human)
       (instance ?MEMBER2 Human)
       (member ?MEMBER1 ?TEAM)
       (member ?MEMBER2 ?TEAM)
       (hasSkill ?SKILL ?MEMBER1)
       (not
         (hasSkill ?SKILL ?MEMBER2))
-      (inScopeOfInterest ?TEAM ?SKILL))))
-
+      (instance ?INST ?SKILL)
+      (inScopeOfInterest ?TEAM ?INST))))
 
 ;; crossFunctionalTeamFocus
 ;; -------------------------------------------------------------------
@@ -4442,7 +4442,7 @@ in other markup languages.")
 (range QualifiedTreatmentsFn Collection)
 
 (documentation QualifiedTreatmentsFn EnglishLanguage "(QualifiedTreatmentsFn ?VISITOR) returns all 
- the &%Processes that ?VISITOR is has the &%capability of being the &%experiencer of which are 
+ the &%Processes that ?VISITOR has the &%capability of being the &%experiencer of which are 
  qualifying events of &%Experimentings.")
 
 (termFormat EnglishLanguage QualifiedTreatmentsFn "qualifed treatments")
@@ -4451,23 +4451,26 @@ in other markup languages.")
   (and
     (instance ?VISITOR Human)
     (instance ?COLL Collection)
-    (forall (?EXPERIMENTING ?EVENT)
+    (forall (?EXPERIMENT ?EVENT)
       (=>
-        (and
-          (instance ?EXPERIMENTING Experimenting)
-          (instance ?EVENT Process)
-          (member ?EVENT (QualifyingEventsFn ?EXPERIMENT))
-          (capability ?EVENT experiencer ?VISITOR))
+        (exists (?CLASS)
+          (and
+            (instance ?EXPERIMENT Experimenting)
+            (instance ?EVENT Process)
+            (member ?EVENT (QualifyingEventsFn ?EXPERIMENT))
+            (instance ?EVENT ?CLASS)
+            (capability ?CLASS experiencer ?VISITOR)))
         (member ?EVENT ?COLL)))
     (=>
       (member ?PROC ?COLL)
       (and
         (instance ?PROC Process)
-        (exists (?EXP)
+        (exists (?EXP ?PROCESS)
           (and
             (instance ?EXP Experimenting)
             (member ?PROC (QualifyingEventsFn ?EXP))
-            (capability ?PROC experiencer ?VISITOR))))))
+            (instance ?PROC ?PROCESS)
+            (capability ?PROCESS experiencer ?VISITOR))))))
   (equal
     (QualifiedTreatmentsFn ?VISITOR)
     ?COLL))
@@ -4673,14 +4676,16 @@ in other markup languages.")
   (and
     (orthogonalTests ?TESTCOL1 ?TESTCOL2)
     (instance ?SUBJECT Human)
-    (instance ?EXPERIMENT1 Experimenting)
+    (instance ?EXPERIMENT1 ?CLASS1)
+    (subclass ?CLASS1 Experimenting)
     (member ?EXPERIMENT1 ?TESTCOL1)
-    (capability ?EXPERIMENT1 experimentalSubject ?SUBJECT))
+    (capability ?CLASS1 experimentalSubject ?SUBJECT))
   (exists (?EXPERIMENT2)
     (and
-      (instance ?EXPERIMENT2 Experimenting)
+      (instance ?EXPERIMENT2 ?CLASS2)
       (member ?EXPERIMENT2 ?TESTCOL2)
-      (capability ?EXPERIMENT2 experimentalSubject ?SUBJECT))))
+      (subclass ?CLASS2 Experimenting)
+      (capability ?CLASS2 experimentalSubject ?SUBJECT))))
 
 
 ;; MultivariateTest