From e36cc73b0fd6f0be4c1c8809db73f997d1484e9d Mon Sep 17 00:00:00 2001
From: krasimir <krasimir@chalmers.se>
Date: Mon, 18 Oct 2010 12:28:39 +0000
Subject: in tutorial/smart remove the hack that forced the proof object to be
 resolved

---
 examples/tutorial/smart/SmartI.gf | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

(limited to 'examples/tutorial/smart/SmartI.gf')

diff --git a/examples/tutorial/smart/SmartI.gf b/examples/tutorial/smart/SmartI.gf
index 2b46ba0fe..b881570d6 100644
--- a/examples/tutorial/smart/SmartI.gf
+++ b/examples/tutorial/smart/SmartI.gf
@@ -14,18 +14,21 @@ lincat
   Action = V2 ;
   Device = NP ;
   Location = N ;
+  Switchable = {} ;
+  Dimmable = {} ;
+  Statelike = {} ;
 
 lin
   UCommand  c = mkUtt politeImpForm c ;
   UQuestion q = mkUtt q ;
 
   CAction _ act dev = mkImp act dev ;
-  QAction _ act st dev = 
-    mkQS anteriorAnt (mkQCl (mkCl dev (passiveVP act))) ; ---- show empty proof
+  QAction _ act _ dev = 
+    mkQS anteriorAnt (mkQCl (mkCl dev (passiveVP act))) ;
 
-  DKindOne k = mkNP defSgDet k ;
-  DKindMany k = mkNP defPlDet k ;
-  DLoc _ dev loc = mkNP dev (mkAdv in_Prep (mkNP defSgDet loc)) ;
+  DKindOne k = mkNP the_Det k ;
+  DKindMany k = mkNP thePl_Det k ;
+  DLoc _ dev loc = mkNP dev (mkAdv in_Prep (mkNP the_Det loc)) ;
 
   light = light_N ;
   fan = fan_N ;
@@ -37,14 +40,5 @@ lin
 
   kitchen = kitchen_N ;
   livingRoom = livingRoom_N ;
-  
-lin
-  switchable_light = ss [] ;
-  switchable_fan  = ss [] ;
-  dimmable_light  = ss [] ;
-
-  statelike_switchOn _ _ = ss [] ;
-  statelike_switchOff _ _ = ss [] ;
-
 
 }
-- 
cgit v1.2.3