~ migrating to CPR
authorEric Prud'hommeaux <eric@w3.org>
Thu, 14 Oct 2010 11:49:00 -0400
changeset 31 adb31ffd0258
parent 30 d5cb0312ef53
child 32 ad74a85b5902
~ migrating to CPR
syntheticPatients/AD_PCHR_1-tmo.trig
syntheticPatients/AD_PCHR_2-tmo.trig
syntheticPatients/AD_PCHR_3-tmo.trig
syntheticPatients/AD_PCHR_4-tmo.trig
syntheticPatients/AD_PCHR_5-tmo.trig
syntheticPatients/AD_PCHR_6-tmo.trig
syntheticPatients/AD_PCHR_7-tmo.trig
syntheticPatients/Indivo2Trig.xsl
syntheticPatients/tests/q1.rq
--- a/syntheticPatients/AD_PCHR_1-tmo.trig	Thu Oct 07 03:35:00 2010 -0400
+++ b/syntheticPatients/AD_PCHR_1-tmo.trig	Thu Oct 14 11:49:00 2010 -0400
@@ -3,9 +3,13 @@
   @prefix foaf: <http://xmlns.com/foaf/0.1/> .
   @prefix trans: <tag:[email protected]:2009/tmo/translator#> .  
   @prefix indivo: <http://indivo.org/vocab/xml/documents#> .
-  @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .  
+  @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+  @prefix cpr: <http://purl.org/cpr/0.75#> .
+  @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+  @prefix ro: <http://www.obofoundry.org/ro/ro.owl#> .
 {
-_:patient  a trans:Patient ;
+  <> a cpr:patient-record ; trans:patient _:patient .
+_:patient  a cpr:patient ;
   
          
   foaf:name "George Andrew Tour" ;
@@ -27,7 +31,9 @@
          
       
   . 
-_:pricare  a trans:PrimaryCarePhysician ;
+
+  trans:PrimaryCarePhysician rdfs:subClassOf cpr:physician . # ont
+  _:pricare  a trans:PrimaryCarePhysician ;
   
          
   foaf:name "Henry No" ;
@@ -46,45 +52,60 @@
     indivo:gender "Male" ;
 ] .
 
-  [ a trans:Prescription ;
+  [ a cpr:substance-administration ;
     trans:prescribedTo _:patient ;
-    indivo:prescribedOn "2009-05-15" ; 
+    cpr:startsNoEarlierThan "2009-05-15" ; 
 
-    trans:genericName "COREG TABLETS" ;    
-  ] .
-
-  [ a trans:Prescription ;
-    trans:prescribedTo _:patient ;
-    indivo:prescribedOn "2009-05-20" ; 
-
-    trans:genericName "LIPITOR TABLETS" ;    
+    ro:has_participant [
+      a cpr:medication  ;
+      trans:genericName "COREG TABLETS" ;    
+    ] ;
   ] .
 
-  [ a trans:Prescription ;
+  [ a cpr:substance-administration ;
     trans:prescribedTo _:patient ;
-    indivo:prescribedOn "2009-05-20" ; 
+    cpr:startsNoEarlierThan "2009-05-20" ; 
 
-    trans:genericName "COUMADIN TABLETS" ;    
+    ro:has_participant [
+      a cpr:medication  ;
+      trans:genericName "LIPITOR TABLETS" ;    
+    ] ;
   ] .
 
-  [ a trans:Prescription ;
+  [ a cpr:substance-administration ;
     trans:prescribedTo _:patient ;
-    indivo:prescribedOn "2009-08-10" ; 
- 
-    trans:datePrescriptionEnded "2009-08-15" ;
+    cpr:startsNoEarlierThan "2009-05-20" ; 
 
-    trans:genericName "DONEPEZIL HYDROCHLORIDE TABLETS" ;    
+    ro:has_participant [
+      a cpr:medication  ;
+      trans:genericName "COUMADIN TABLETS" ;    
+    ] ;
   ] .
 
-  [ a trans:Prescription ;
+  [ a cpr:substance-administration ;
     trans:prescribedTo _:patient ;
-    indivo:prescribedOn "2009-08-15" ; 
+    cpr:startsNoEarlierThan "2009-08-10" ; 
+ 
+    cpr:stopsNoEarlierThan "2009-08-15" ;
 
-    trans:genericName "ARICEPT TABLETS ORALLY DISINTEGRATING" ;    
+    ro:has_participant [
+      a cpr:medication  ;
+      trans:genericName "DONEPEZIL HYDROCHLORIDE TABLETS" ;    
+    ] ;
+  ] .
+
+  [ a cpr:substance-administration ;
+    trans:prescribedTo _:patient ;
+    cpr:startsNoEarlierThan "2009-08-15" ; 
+
+    ro:has_participant [
+      a cpr:medication  ;
+      trans:genericName "ARICEPT TABLETS ORALLY DISINTEGRATING" ;    
+    ] ;
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "2009-05-15T12:00:00" ;
+  cpr:startsNoLaterThan "2009-05-15T12:00:00" ;
 
   trans:diagnosedWith "hypertension" ;
   trans:ICD9 "410" ;
@@ -94,7 +115,7 @@
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "2009-05-20T12:00:00" ;
+  cpr:startsNoLaterThan "2009-05-20T12:00:00" ;
 
   trans:diagnosedWith "hypercholesterolaemia" ;
   trans:ICD9 "272" ;
@@ -104,7 +125,7 @@
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "2009-05-20T12:00:00" ;
+  cpr:startsNoLaterThan "2009-05-20T12:00:00" ;
 
   trans:diagnosedWith "atrial fibrillation" ;
   trans:ICD9 "427" ;
@@ -114,7 +135,7 @@
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "2009-08-10T12:00:00" ;
+  cpr:startsNoLaterThan "2009-08-10T12:00:00" ;
 
   trans:diagnosedWith "alzheimer’s disease" ;
   trans:ICD9 "331" ;
--- a/syntheticPatients/AD_PCHR_2-tmo.trig	Thu Oct 07 03:35:00 2010 -0400
+++ b/syntheticPatients/AD_PCHR_2-tmo.trig	Thu Oct 14 11:49:00 2010 -0400
@@ -3,9 +3,13 @@
   @prefix foaf: <http://xmlns.com/foaf/0.1/> .
   @prefix trans: <tag:[email protected]:2009/tmo/translator#> .  
   @prefix indivo: <http://indivo.org/vocab/xml/documents#> .
-  @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .  
+  @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+  @prefix cpr: <http://purl.org/cpr/0.75#> .
+  @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+  @prefix ro: <http://www.obofoundry.org/ro/ro.owl#> .
 {
-_:patient  a trans:Patient ;
+  <> a cpr:patient-record ; trans:patient _:patient .
+_:patient  a cpr:patient ;
   
          
   foaf:name "Monica Mary Mall" ;
@@ -26,7 +30,9 @@
          
       
   . 
-_:pricare  a trans:PrimaryCarePhysician ;
+
+  trans:PrimaryCarePhysician rdfs:subClassOf cpr:physician . # ont
+  _:pricare  a trans:PrimaryCarePhysician ;
   
          
   foaf:name "Bill Stall" ;
@@ -45,61 +51,82 @@
     indivo:gender "Female" ;
 ] .
 
-  [ a trans:Prescription ;
-    trans:prescribedTo _:patient ;
-    indivo:prescribedOn "2007-07-20" ; 
-
-    trans:genericName "ATORVASTATIN TABLET" ;    
-  ] .
-
-  [ a trans:Prescription ;
+  [ a cpr:substance-administration ;
     trans:prescribedTo _:patient ;
-    indivo:prescribedOn "2007-07-20" ; 
-
-    trans:genericName "CHEWABLE ORANGE ASPIRIN TABLETS" ;    
-  ] .
+    cpr:startsNoEarlierThan "2007-07-20" ; 
 
-  [ a trans:Prescription ;
-    trans:prescribedTo _:patient ;
-    indivo:prescribedOn "2008-03-20" ; 
-
-    trans:genericName "CLOPIDOGREL TABLETS" ;    
+    ro:has_participant [
+      a cpr:medication  ;
+      trans:genericName "ATORVASTATIN TABLET" ;    
+    ] ;
   ] .
 
-  [ a trans:Prescription ;
+  [ a cpr:substance-administration ;
     trans:prescribedTo _:patient ;
-    indivo:prescribedOn "2008-03-20" ; 
- 
-    trans:datePrescriptionEnded "2009-08-15" ;
+    cpr:startsNoEarlierThan "2007-07-20" ; 
 
-    trans:genericName "CARVEDILOL TABLETS" ;    
+    ro:has_participant [
+      a cpr:medication  ;
+      trans:genericName "CHEWABLE ORANGE ASPIRIN TABLETS" ;    
+    ] ;
   ] .
 
-  [ a trans:Prescription ;
+  [ a cpr:substance-administration ;
     trans:prescribedTo _:patient ;
-    indivo:prescribedOn "2008-05-18" ; 
+    cpr:startsNoEarlierThan "2008-03-20" ; 
 
-    trans:genericName "FLUOXETINE CAPSULES" ;    
+    ro:has_participant [
+      a cpr:medication  ;
+      trans:genericName "CLOPIDOGREL TABLETS" ;    
+    ] ;
   ] .
 
-  [ a trans:Prescription ;
+  [ a cpr:substance-administration ;
     trans:prescribedTo _:patient ;
-    indivo:prescribedOn "2008-05-18" ; 
+    cpr:startsNoEarlierThan "2008-03-20" ; 
  
-    trans:datePrescriptionEnded "2009-08-15" ;
+    cpr:stopsNoEarlierThan "2009-08-15" ;
 
-    trans:genericName "DIAZEPAM TABLETS" ;    
+    ro:has_participant [
+      a cpr:medication  ;
+      trans:genericName "CARVEDILOL TABLETS" ;    
+    ] ;
   ] .
 
-  [ a trans:Prescription ;
+  [ a cpr:substance-administration ;
     trans:prescribedTo _:patient ;
-    indivo:prescribedOn "2009-10-15" ; 
+    cpr:startsNoEarlierThan "2008-05-18" ; 
 
-    trans:genericName "MEMANTINE HYDROCHLORIDE" ;    
+    ro:has_participant [
+      a cpr:medication  ;
+      trans:genericName "FLUOXETINE CAPSULES" ;    
+    ] ;
+  ] .
+
+  [ a cpr:substance-administration ;
+    trans:prescribedTo _:patient ;
+    cpr:startsNoEarlierThan "2008-05-18" ; 
+ 
+    cpr:stopsNoEarlierThan "2009-08-15" ;
+
+    ro:has_participant [
+      a cpr:medication  ;
+      trans:genericName "DIAZEPAM TABLETS" ;    
+    ] ;
+  ] .
+
+  [ a cpr:substance-administration ;
+    trans:prescribedTo _:patient ;
+    cpr:startsNoEarlierThan "2009-10-15" ; 
+
+    ro:has_participant [
+      a cpr:medication  ;
+      trans:genericName "MEMANTINE HYDROCHLORIDE" ;    
+    ] ;
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "2004-07-10T12:00:00" ;
+  cpr:startsNoLaterThan "2004-07-10T12:00:00" ;
 
   trans:diagnosedWith "mild cognitive impairment" ;
   trans:ICD9 "290.0" ;
@@ -109,7 +136,7 @@
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "2007-07-20T12:00:00" ;
+  cpr:startsNoLaterThan "2007-07-20T12:00:00" ;
 
   trans:diagnosedWith "hypercholesterolaemia" ;
   trans:ICD9 "272" ;
@@ -119,7 +146,7 @@
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "2008-03-18T12:00:00" ;
+  cpr:startsNoLaterThan "2008-03-18T12:00:00" ;
 
   trans:diagnosedWith "myocardial infarction" ;
   trans:ICD9 "410.3" ;
@@ -129,7 +156,7 @@
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "2008-05-16T12:00:00" ;
+  cpr:startsNoLaterThan "2008-05-16T12:00:00" ;
 
   trans:diagnosedWith "anxiety depression" ;
   trans:ICD9 "300.4" ;
@@ -139,7 +166,7 @@
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "2009-10-15T12:00:00" ;
+  cpr:startsNoLaterThan "2009-10-15T12:00:00" ;
 
   trans:diagnosedWith "alzheimer’s disease" ;
   trans:ICD9 "331" ;
--- a/syntheticPatients/AD_PCHR_3-tmo.trig	Thu Oct 07 03:35:00 2010 -0400
+++ b/syntheticPatients/AD_PCHR_3-tmo.trig	Thu Oct 14 11:49:00 2010 -0400
@@ -3,9 +3,13 @@
   @prefix foaf: <http://xmlns.com/foaf/0.1/> .
   @prefix trans: <tag:[email protected]:2009/tmo/translator#> .  
   @prefix indivo: <http://indivo.org/vocab/xml/documents#> .
-  @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .  
+  @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+  @prefix cpr: <http://purl.org/cpr/0.75#> .
+  @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+  @prefix ro: <http://www.obofoundry.org/ro/ro.owl#> .
 {
-_:patient  a trans:Patient ;
+  <> a cpr:patient-record ; trans:patient _:patient .
+_:patient  a cpr:patient ;
   
          
   foaf:name "Benny Smith" ;
@@ -24,7 +28,9 @@
          
       
   . 
-_:pricare  a trans:PrimaryCarePhysician ;
+
+  trans:PrimaryCarePhysician rdfs:subClassOf cpr:physician . # ont
+  _:pricare  a trans:PrimaryCarePhysician ;
   
          
   foaf:name "Sridhar Banerjee" ;
@@ -43,50 +49,68 @@
     indivo:gender "Male" ;
 ] .
 
-  [ a trans:Prescription ;
+  [ a cpr:substance-administration ;
     trans:prescribedTo _:patient ;
-    indivo:prescribedOn "2005-07-09" ; 
+    cpr:startsNoEarlierThan "2005-07-09" ; 
 
-    trans:genericName "CODEINE TABLETS" ;    
-  ] .
-
-  [ a trans:Prescription ;
-    trans:prescribedTo _:patient ;
-    indivo:prescribedOn "2005-07-09" ; 
-
-    trans:genericName "CELECOXIB CAPSULES" ;    
+    ro:has_participant [
+      a cpr:medication  ;
+      trans:genericName "CODEINE TABLETS" ;    
+    ] ;
   ] .
 
-  [ a trans:Prescription ;
+  [ a cpr:substance-administration ;
     trans:prescribedTo _:patient ;
-    indivo:prescribedOn "2006-11-11" ; 
+    cpr:startsNoEarlierThan "2005-07-09" ; 
 
-    trans:genericName "DOCUSATE SODIUM CAPSULES" ;    
+    ro:has_participant [
+      a cpr:medication  ;
+      trans:genericName "CELECOXIB CAPSULES" ;    
+    ] ;
   ] .
 
-  [ a trans:Prescription ;
+  [ a cpr:substance-administration ;
     trans:prescribedTo _:patient ;
-    indivo:prescribedOn "2007-11-09" ; 
+    cpr:startsNoEarlierThan "2006-11-11" ; 
 
-    trans:genericName "LACTULOSE" ;    
+    ro:has_participant [
+      a cpr:medication  ;
+      trans:genericName "DOCUSATE SODIUM CAPSULES" ;    
+    ] ;
   ] .
 
-  [ a trans:Prescription ;
+  [ a cpr:substance-administration ;
     trans:prescribedTo _:patient ;
-    indivo:prescribedOn "2007-11-09" ; 
+    cpr:startsNoEarlierThan "2007-11-09" ; 
 
-    trans:genericName "OMEPRAZOLE CAPSULES" ;    
+    ro:has_participant [
+      a cpr:medication  ;
+      trans:genericName "LACTULOSE" ;    
+    ] ;
   ] .
 
-  [ a trans:Prescription ;
+  [ a cpr:substance-administration ;
     trans:prescribedTo _:patient ;
-    indivo:prescribedOn "2009-11-09" ; 
+    cpr:startsNoEarlierThan "2007-11-09" ; 
 
-    trans:genericName "DONEPEZIL HYDROCHLORIDE TABLETS" ;    
+    ro:has_participant [
+      a cpr:medication  ;
+      trans:genericName "OMEPRAZOLE CAPSULES" ;    
+    ] ;
+  ] .
+
+  [ a cpr:substance-administration ;
+    trans:prescribedTo _:patient ;
+    cpr:startsNoEarlierThan "2009-11-09" ; 
+
+    ro:has_participant [
+      a cpr:medication  ;
+      trans:genericName "DONEPEZIL HYDROCHLORIDE TABLETS" ;    
+    ] ;
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "2001-01-03T12:00:00" ;
+  cpr:startsNoLaterThan "2001-01-03T12:00:00" ;
 
   trans:diagnosedWith "Osteoarthrosis generalized involving hand" ;
   trans:ICD9 "715.04" ;
@@ -96,7 +120,7 @@
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "2005-11-03T12:00:00" ;
+  cpr:startsNoLaterThan "2005-11-03T12:00:00" ;
 
   trans:diagnosedWith "Alzheimer's Disease" ;
   trans:ICD9 "331" ;
@@ -106,7 +130,7 @@
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "2007-09-23T12:00:00" ;
+  cpr:startsNoLaterThan "2007-09-23T12:00:00" ;
 
   trans:diagnosedWith "Dyspepsia and other specified disorders of stomach" ;
   trans:ICD9 "536.8" ;
--- a/syntheticPatients/AD_PCHR_4-tmo.trig	Thu Oct 07 03:35:00 2010 -0400
+++ b/syntheticPatients/AD_PCHR_4-tmo.trig	Thu Oct 14 11:49:00 2010 -0400
@@ -3,9 +3,13 @@
   @prefix foaf: <http://xmlns.com/foaf/0.1/> .
   @prefix trans: <tag:[email protected]:2009/tmo/translator#> .  
   @prefix indivo: <http://indivo.org/vocab/xml/documents#> .
-  @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .  
+  @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+  @prefix cpr: <http://purl.org/cpr/0.75#> .
+  @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+  @prefix ro: <http://www.obofoundry.org/ro/ro.owl#> .
 {
-_:patient  a trans:Patient ;
+  <> a cpr:patient-record ; trans:patient _:patient .
+_:patient  a cpr:patient ;
   
          
   foaf:name "Edward Quesada" ;
@@ -27,7 +31,9 @@
          
       
   . 
-_:pricare  a trans:PrimaryCarePhysician ;
+
+  trans:PrimaryCarePhysician rdfs:subClassOf cpr:physician . # ont
+  _:pricare  a trans:PrimaryCarePhysician ;
   
          
   foaf:name "Margaret Cho" ;
@@ -46,29 +52,38 @@
     indivo:gender "Male" ;
 ] .
 
-  [ a trans:Prescription ;
+  [ a cpr:substance-administration ;
     trans:prescribedTo _:patient ;
-    indivo:prescribedOn "1989-05-15" ; 
+    cpr:startsNoEarlierThan "1989-05-15" ; 
 
-    trans:genericName "TEGRETOL TABLETS EXTENDED RELEASE" ;    
+    ro:has_participant [
+      a cpr:medication  ;
+      trans:genericName "TEGRETOL TABLETS EXTENDED RELEASE" ;    
+    ] ;
   ] .
 
-  [ a trans:Prescription ;
+  [ a cpr:substance-administration ;
     trans:prescribedTo _:patient ;
-    indivo:prescribedOn "2009-08-20" ; 
+    cpr:startsNoEarlierThan "2009-08-20" ; 
 
-    trans:genericName "DONEPEZIL HYDROCHLORIDE TABLETS" ;    
+    ro:has_participant [
+      a cpr:medication  ;
+      trans:genericName "DONEPEZIL HYDROCHLORIDE TABLETS" ;    
+    ] ;
   ] .
 
-  [ a trans:Prescription ;
+  [ a cpr:substance-administration ;
     trans:prescribedTo _:patient ;
-    indivo:prescribedOn "2009-05-20" ; 
+    cpr:startsNoEarlierThan "2009-05-20" ; 
 
-    trans:genericName "CARVEDILOL TABLETS" ;    
+    ro:has_participant [
+      a cpr:medication  ;
+      trans:genericName "CARVEDILOL TABLETS" ;    
+    ] ;
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "1950-05-15T12:00:00" ;
+  cpr:startsNoLaterThan "1950-05-15T12:00:00" ;
 
   trans:diagnosedWith "Epilepsy and recurrent seizures" ;
   trans:ICD9 "345" ;
@@ -78,7 +93,7 @@
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "1995-05-20T12:00:00" ;
+  cpr:startsNoLaterThan "1995-05-20T12:00:00" ;
 
   trans:diagnosedWith "Hypertension" ;
   trans:ICD9 "402.1" ;
@@ -88,7 +103,7 @@
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "2009-05-20T12:00:00" ;
+  cpr:startsNoLaterThan "2009-05-20T12:00:00" ;
 
   trans:diagnosedWith "Alzheimer’s Dementia" ;
   trans:ICD9 "331.0" ;
--- a/syntheticPatients/AD_PCHR_5-tmo.trig	Thu Oct 07 03:35:00 2010 -0400
+++ b/syntheticPatients/AD_PCHR_5-tmo.trig	Thu Oct 14 11:49:00 2010 -0400
@@ -3,9 +3,13 @@
   @prefix foaf: <http://xmlns.com/foaf/0.1/> .
   @prefix trans: <tag:[email protected]:2009/tmo/translator#> .  
   @prefix indivo: <http://indivo.org/vocab/xml/documents#> .
-  @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .  
+  @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+  @prefix cpr: <http://purl.org/cpr/0.75#> .
+  @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+  @prefix ro: <http://www.obofoundry.org/ro/ro.owl#> .
 {
-_:patient  a trans:Patient ;
+  <> a cpr:patient-record ; trans:patient _:patient .
+_:patient  a cpr:patient ;
   
          
   foaf:name "Georg Steffen Möller" ;
@@ -27,7 +31,9 @@
          
       
   . 
-_:pricare  a trans:PrimaryCarePhysician ;
+
+  trans:PrimaryCarePhysician rdfs:subClassOf cpr:physician . # ont
+  _:pricare  a trans:PrimaryCarePhysician ;
   
          
   foaf:name "David Winizki" ;
@@ -46,45 +52,60 @@
     indivo:gender "Male" ;
 ] .
 
-  [ a trans:Prescription ;
+  [ a cpr:substance-administration ;
     trans:prescribedTo _:patient ;
-    indivo:prescribedOn "2008-02-03" ; 
+    cpr:startsNoEarlierThan "2008-02-03" ; 
 
-    trans:genericName "ATORVASTATIN TABLET" ;    
-  ] .
-
-  [ a trans:Prescription ;
-    trans:prescribedTo _:patient ;
-    indivo:prescribedOn "2008-05-06" ; 
-
-    trans:genericName "CARVEDILOL TABLETS" ;    
+    ro:has_participant [
+      a cpr:medication  ;
+      trans:genericName "ATORVASTATIN TABLET" ;    
+    ] ;
   ] .
 
-  [ a trans:Prescription ;
+  [ a cpr:substance-administration ;
     trans:prescribedTo _:patient ;
-    indivo:prescribedOn "2008-05-06" ; 
+    cpr:startsNoEarlierThan "2008-05-06" ; 
 
-    trans:genericName "CLOPIDOGREL TABLETS" ;    
+    ro:has_participant [
+      a cpr:medication  ;
+      trans:genericName "CARVEDILOL TABLETS" ;    
+    ] ;
   ] .
 
-  [ a trans:Prescription ;
+  [ a cpr:substance-administration ;
     trans:prescribedTo _:patient ;
-    indivo:prescribedOn "2009-06-18" ; 
+    cpr:startsNoEarlierThan "2008-05-06" ; 
 
-    trans:genericName "OMEPRAZOLE CAPSULES" ;    
+    ro:has_participant [
+      a cpr:medication  ;
+      trans:genericName "CLOPIDOGREL TABLETS" ;    
+    ] ;
   ] .
 
-  [ a trans:Prescription ;
+  [ a cpr:substance-administration ;
     trans:prescribedTo _:patient ;
-    indivo:prescribedOn "2009-07-22" ; 
+    cpr:startsNoEarlierThan "2009-06-18" ; 
+
+    ro:has_participant [
+      a cpr:medication  ;
+      trans:genericName "OMEPRAZOLE CAPSULES" ;    
+    ] ;
+  ] .
+
+  [ a cpr:substance-administration ;
+    trans:prescribedTo _:patient ;
+    cpr:startsNoEarlierThan "2009-07-22" ; 
  
-    trans:datePrescriptionEnded "2009-10-29" ;
+    cpr:stopsNoEarlierThan "2009-10-29" ;
 
-    trans:genericName "DONEPEZIL HYDROCHLORIDE TABLETS" ;    
+    ro:has_participant [
+      a cpr:medication  ;
+      trans:genericName "DONEPEZIL HYDROCHLORIDE TABLETS" ;    
+    ] ;
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "2008-02-03T12:00:00" ;
+  cpr:startsNoLaterThan "2008-02-03T12:00:00" ;
 
   trans:diagnosedWith "hypertension" ;
   trans:ICD9 "410" ;
@@ -94,7 +115,7 @@
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "2009-07-21T12:00:00" ;
+  cpr:startsNoLaterThan "2009-07-21T12:00:00" ;
 
   trans:diagnosedWith "alzheimer’s disease" ;
   trans:ICD9 "331" ;
@@ -104,7 +125,7 @@
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "2008-05-06T12:00:00" ;
+  cpr:startsNoLaterThan "2008-05-06T12:00:00" ;
 
   trans:diagnosedWith "acute coronary occlusion without myocardial infarction" ;
   trans:ICD9 "414" ;
@@ -114,7 +135,7 @@
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "2009-06-18T12:00:00" ;
+  cpr:startsNoLaterThan "2009-06-18T12:00:00" ;
 
   trans:diagnosedWith "gastroesophageal reflux disease" ;
   trans:ICD9 "530.81" ;
@@ -124,7 +145,7 @@
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "2009-07-23T12:00:00" ;
+  cpr:startsNoLaterThan "2009-07-23T12:00:00" ;
 
   trans:diagnosedWith "nausea and vomiting" ;
   trans:ICD9 "787.0" ;
@@ -134,7 +155,7 @@
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "2009-07-23T12:00:00" ;
+  cpr:startsNoLaterThan "2009-07-23T12:00:00" ;
 
   trans:diagnosedWith "adverse drug effect" ;
   trans:ICD9 "9995.2" ;
--- a/syntheticPatients/AD_PCHR_6-tmo.trig	Thu Oct 07 03:35:00 2010 -0400
+++ b/syntheticPatients/AD_PCHR_6-tmo.trig	Thu Oct 14 11:49:00 2010 -0400
@@ -3,9 +3,13 @@
   @prefix foaf: <http://xmlns.com/foaf/0.1/> .
   @prefix trans: <tag:[email protected]:2009/tmo/translator#> .  
   @prefix indivo: <http://indivo.org/vocab/xml/documents#> .
-  @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .  
+  @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+  @prefix cpr: <http://purl.org/cpr/0.75#> .
+  @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+  @prefix ro: <http://www.obofoundry.org/ro/ro.owl#> .
 {
-_:patient  a trans:Patient ;
+  <> a cpr:patient-record ; trans:patient _:patient .
+_:patient  a cpr:patient ;
   
          
   foaf:name "Marianne Huber" ;
@@ -27,7 +31,9 @@
 
       
   . 
-_:pricare  a trans:PrimaryCarePhysician ;
+
+  trans:PrimaryCarePhysician rdfs:subClassOf cpr:physician . # ont
+  _:pricare  a trans:PrimaryCarePhysician ;
   
          
   foaf:name "Larry Lu" ;
@@ -46,24 +52,30 @@
     indivo:gender "Female" ;
 ] .
 
-  [ a trans:Prescription ;
+  [ a cpr:substance-administration ;
     trans:prescribedTo _:patient ;
-    indivo:prescribedOn "2009-07-20>" ; 
+    cpr:startsNoEarlierThan "2009-07-20>" ; 
  
-    trans:datePrescriptionEnded "2009-11-16" ;
+    cpr:stopsNoEarlierThan "2009-11-16" ;
 
-    trans:genericName "DONEPEZIL HYDROCHLORIDE TABLETS" ;    
+    ro:has_participant [
+      a cpr:medication  ;
+      trans:genericName "DONEPEZIL HYDROCHLORIDE TABLETS" ;    
+    ] ;
   ] .
 
-  [ a trans:Prescription ;
+  [ a cpr:substance-administration ;
     trans:prescribedTo _:patient ;
-    indivo:prescribedOn "2009-11-09" ; 
+    cpr:startsNoEarlierThan "2009-11-09" ; 
 
-    trans:genericName "AMLODIPINE TABLETS" ;    
+    ro:has_participant [
+      a cpr:medication  ;
+      trans:genericName "AMLODIPINE TABLETS" ;    
+    ] ;
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "2008-11-09T12:00:00" ;
+  cpr:startsNoLaterThan "2008-11-09T12:00:00" ;
 
   trans:diagnosedWith "Hypertension" ;
   trans:ICD9 "401.9" ;
@@ -73,7 +85,7 @@
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "2009-11-09T12:00:00" ;
+  cpr:startsNoLaterThan "2009-11-09T12:00:00" ;
 
   trans:diagnosedWith "Hypocalcemia" ;
   trans:ICD9 "275.41" ;
--- a/syntheticPatients/AD_PCHR_7-tmo.trig	Thu Oct 07 03:35:00 2010 -0400
+++ b/syntheticPatients/AD_PCHR_7-tmo.trig	Thu Oct 14 11:49:00 2010 -0400
@@ -3,9 +3,13 @@
   @prefix foaf: <http://xmlns.com/foaf/0.1/> .
   @prefix trans: <tag:[email protected]:2009/tmo/translator#> .  
   @prefix indivo: <http://indivo.org/vocab/xml/documents#> .
-  @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .  
+  @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+  @prefix cpr: <http://purl.org/cpr/0.75#> .
+  @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+  @prefix ro: <http://www.obofoundry.org/ro/ro.owl#> .
 {
-_:patient  a trans:Patient ;
+  <> a cpr:patient-record ; trans:patient _:patient .
+_:patient  a cpr:patient ;
   
          
   foaf:name "Julianne Sarah Christopherson" ;
@@ -27,7 +31,9 @@
          
       
   . 
-_:pricare  a trans:PrimaryCarePhysician ;
+
+  trans:PrimaryCarePhysician rdfs:subClassOf cpr:physician . # ont
+  _:pricare  a trans:PrimaryCarePhysician ;
   
          
   foaf:name "Michael Matthews" ;
@@ -47,7 +53,7 @@
 ] .
 
   _:patient trans:hasCondition [
-  trans:onset "1978-01-31T12:00:00" ;
+  cpr:startsNoLaterThan "1978-01-31T12:00:00" ;
 
   trans:diagnosedWith "Down Syndrome" ;
   trans:ICD9 "758" ;
@@ -57,7 +63,7 @@
   ] .
 
   _:patient trans:hasCondition [
-  trans:onset "2009-02-01T12:00:00" ;
+  cpr:startsNoLaterThan "2009-02-01T12:00:00" ;
 
   trans:diagnosedWith "Alzheimer’s Disease" ;
   trans:ICD9 "331" ;
--- a/syntheticPatients/Indivo2Trig.xsl	Thu Oct 07 03:35:00 2010 -0400
+++ b/syntheticPatients/Indivo2Trig.xsl	Thu Oct 14 11:49:00 2010 -0400
@@ -15,8 +15,12 @@
   @prefix foaf: &lt;http://xmlns.com/foaf/0.1/&gt; .
   @prefix trans: &lt;tag:[email protected]:2009/tmo/translator#&gt; .  
   @prefix indivo: &lt;http://indivo.org/vocab/xml/documents#&gt; .
-  @prefix xsd: &lt;http://www.w3.org/2001/XMLSchema#&gt; .  
+  @prefix xsd: &lt;http://www.w3.org/2001/XMLSchema#&gt; .
+  @prefix cpr: &lt;http://purl.org/cpr/0.75#&gt; .
+  @prefix rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt; .
+  @prefix ro: &lt;http://www.obofoundry.org/ro/ro.owl#&gt; .
 {
+  &lt;&gt; a cpr:patient-record ; trans:patient _:patient .
 <xsl:apply-templates select="in:CurrentStatus"/>
 <xsl:apply-templates select="in:Encounter"/>
 }
@@ -38,11 +42,12 @@
 <xsl:template match="in:Contact">
   <xsl:call-template name="contact">
     <xsl:with-param name="subject" select="'_:patient'"/>
-    <xsl:with-param name="type" select="'trans:Patient'"/>
+    <xsl:with-param name="type" select="'cpr:patient'"/>
   </xsl:call-template>
 </xsl:template>
 
 <xsl:template match="in:PrimaryCarePhysician">
+  trans:PrimaryCarePhysician rdfs:subClassOf cpr:physician . # ont
   <xsl:call-template name="contact">
     <xsl:with-param name="subject" select="'_:pricare'"/>
     <xsl:with-param name="type" select="'trans:PrimaryCarePhysician'"/>
@@ -92,13 +97,16 @@
 </xsl:template>
 
 <xsl:template match="in:Prescription">
-  [ a trans:Prescription ;
+  [ a cpr:substance-administration ;
     trans:prescribedTo _:patient ;
-    indivo:prescribedOn <xsl:apply-templates mode="date" select="in:medication/in:dateStarted"/> ; <!-- trans:dateStarted -->
+    cpr:startsNoEarlierThan <xsl:apply-templates mode="date" select="in:medication/in:dateStarted"/> ; <!-- trans:dateStarted -->
 <xsl:if test="in:medication/in:dateStopped"> 
-    trans:datePrescriptionEnded <xsl:apply-templates mode="date" select="in:medication/in:dateStopped"/> ;
+    cpr:stopsNoEarlierThan <xsl:apply-templates mode="date" select="in:medication/in:dateStopped"/> ;
 </xsl:if>
-    trans:genericName "<xsl:value-of select="in:medication/in:genericName"/>" ;    
+    ro:has_participant [
+      a cpr:medication  ;
+      trans:genericName "<xsl:value-of select="in:medication/in:genericName"/>" ;    
+    ] ;
   ] .
 </xsl:template>
 
@@ -112,7 +120,7 @@
 </xsl:template>
 
 <xsl:template mode="problem" match="in:dateOnset">
-  trans:onset <xsl:apply-templates mode="date" select="."/> ;
+  cpr:startsNoLaterThan <xsl:apply-templates mode="date" select="."/> ;
 </xsl:template>
 
 <xsl:template mode="problem" match="in:name">
--- a/syntheticPatients/tests/q1.rq	Thu Oct 07 03:35:00 2010 -0400
+++ b/syntheticPatients/tests/q1.rq	Thu Oct 14 11:49:00 2010 -0400
@@ -1,6 +1,8 @@
 PREFIX indivo: <http://indivo.org/vocab/xml/documents#>
 PREFIX trans: <tag:[email protected]:2009/tmo/translator#>
+PREFIX cpr: <http://purl.org/cpr/0.75#>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX ro: <http://www.obofoundry.org/ro/ro.owl#>
 SELECT distinct(?patient) ?patient_name  ?encounter_date ?symptoms ?diagnosis ?drug_name ?prescription_start
 WHERE {
  graph <pchr> 
@@ -11,9 +13,9 @@
             trans:workingDiagnosis ?diagnosis ;
             trans:dateOfEncounter ?encounter_date .
  ?drug trans:prescribedTo ?patient ; # dateStarted
-       indivo:prescribedOn ?prescription_start;
-       trans:datePrescriptionEnded ?prescription_end;
-       trans:genericName ?drug_name
+       cpr:startsNoEarlierThan ?prescription_start;
+       cpr:stopsNoEarlierThan ?prescription_end;
+       ro:has_participant [ trans:genericName ?drug_name ]
  FILTER regex(?drug_name,"DONEPEZIL","i").
  FILTER (?prescription_start <= ?encounter_date && ?prescription_end >= ?encounter_date)
  }