Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some linter errors in schema MCFs (https://github.com/datacommonsorg/schema/issues/65) #66

Merged
merged 1 commit into from
Aug 30, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions biomedical_schema/chemical_compound.mcf
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ typeOf: schema:Property
rangeIncludes: dcs:DosageFormEnum
domainIncludes: schema:Drug
description: "A dosage form is the physical form in which a drug is produced and dispensed, such as a tablet, a capsule, or an injectable."
descriptionURL: "https://www.fda.gov/drugs/drug-approvals-and-databases/drugsfda-glossary-terms#form"
descriptionUrl: "https://www.fda.gov/drugs/drug-approvals-and-databases/drugsfda-glossary-terms#form"

Node: dcid:drugName
name: "drugName"
Expand Down Expand Up @@ -744,15 +744,15 @@ typeOf: schema:Property
rangeIncludes: schema:Boolean
domainIncludes: dcs:ChemicalCompoundGeneAssociation
description: "True if the pair of entities was found in a pharmacokinetic pathway on PharmGKB, or if the Variant Annotation or Very Important Pharmacogene (VIP) was annotated with pharmacokinetic (PK) in some manner."
descriptionURL: "https://www.pharmgkb.org/page/downloadRelationshipsHelp"
descriptionUrl: "https://www.pharmgkb.org/page/downloadRelationshipsHelp"

Node: dcid:isPharmacodynamicRelationship
name: "isPharmacodynamicRelationship"
typeOf: schema:Property
rangeIncludes: schema:Boolean
domainIncludes: dcs:ChemicalCompoundGeneAssociation
description: "True if the pair of entities was found in a pharmacodynamic pathway on PharmGKB, or if the Variant Annotation or Very Important Pharmacogene (VIP) was annotated with Pharmacodynamic (PD) in some manner."
descriptionURL: "https://www.pharmgkb.org/page/downloadRelationshipsHelp"
descriptionUrl: "https://www.pharmgkb.org/page/downloadRelationshipsHelp"

Node: dcid:relationshipAssociationType
name: "relationshipAssociationType"
Expand Down
314 changes: 157 additions & 157 deletions biomedical_schema/chemical_compound_enum.mcf

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion biomedical_schema/genome_annotation.mcf
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ name: "Allele"

Node: dcid:frequency
typeOf: schema:Property
domainIncludes: schema:Observation
domainIncludes: dcid:Allele
rangeIncludes: schema:Number
name: "frequency"

Expand Down
8 changes: 7 additions & 1 deletion core/WorldDevelopmentIndicators.mcf
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ typeOf: dcs:EconomicMetricEnum
description: "Represents prices of different areas using a common good or goods to contrast the real purchasing power between different currencies."
descriptionUrl: "https://en.wikipedia.org/wiki/Purchasing_power_parity"

Node: dcid:hasComputer
name: "hasComputer"
typeOf: schema:Property
domainIncludes: dcs:Household
rangeIncludes: schema:Boolean

Node: dcid:emittedThing
name: "emittedThing"
typeOf: schema:Property
Expand Down Expand Up @@ -333,4 +339,4 @@ Node: dcid:LiveBirth
name: "LiveBirth"
typeOf: dcs:MedicalEventEnum
description: "The complete expulsion or extraction from its mother of a product of conception, irrespective of the duration of the pregnancy, which, after such separation, breathes or shows any other evidence of life such as beating of the heart, pulsation of the umbilical cord, or definite movement of voluntary muscles, whether or not the umbilical cord has been cut or the placenta is attached."
descriptionurl: "https://www.who.int/data/gho/indicator-metadata-registry/imr-details/26"
descriptionUrl: "https://www.who.int/data/gho/indicator-metadata-registry/imr-details/26"
6 changes: 3 additions & 3 deletions core/bls.mcf
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ dcid: dcs:BLSSeasonallyAdjusted
typeOf: dcs:SeasonalAdjustmentEnum
name: "BLSSeasonallyAdjusted"
description: "Indicates the adjustment of time series data to eliminate the effect of intrayear variations which tend to occur during the same period on an annual basis"
desriptionUrl: "https://www.bls.gov/help/def/ce.htm"
descriptionUrl: "https://www.bls.gov/help/def/ce.htm"

Node: BLSSeasonallyUnadjustedEnum
dcid: dcs:BLSSeasonallyUnadjusted
Expand All @@ -215,8 +215,8 @@ description: "Indicates raw time series data without adjustments to eliminate th
Node: dcid:jobChangeEvent
name: "jobChangeEvent"
typeOf: schema:Property
domain: schema:Person
range: dcs:JobChangeEventEnum
domainIncludes: schema:Person
rangeIncludes: dcs:JobChangeEventEnum

Node: dcid:JobChangeEventEnum
name: "JobChangeEventEnum"
Expand Down
4 changes: 2 additions & 2 deletions core/census_enums.mcf
Original file line number Diff line number Diff line change
Expand Up @@ -1478,7 +1478,7 @@ name: "SameHouse1YearAgo"

Node: dcid:DifferentHouseInTheUS
typeOf: dcs:USC_ResidentStatusEnum
specializtionOf: dcs:DifferentHouse1YearAgo
specializationOf: dcs:DifferentHouse1YearAgo
name: "DifferentHouseInTheUS"

Node: dcid:DifferentHouseInSameCounty
Expand All @@ -1503,7 +1503,7 @@ name: "DifferentHouseInDifferentCountyDifferentState"

Node: dcid:DifferentHouseAbroad
typeOf: dcs:USC_ResidentStatusEnum
specializtionOf: dcs:DifferentHouse1YearAgo
specializationOf: dcs:DifferentHouse1YearAgo
name: "DifferentHouseAbroad"

Node: dcid:USC_FacilitiesEnum
Expand Down
20 changes: 20 additions & 0 deletions core/census_properties.mcf
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,19 @@ rangeIncludes: dcs:USC_CitizenshipEnum
name: "citizenship"
typeOf: schema:Property
domainIncludes: schema:Person
supersededBy: dcs:citizenshipStatus

Node: dcid:citizenshipStatus
rangeIncludes: dcs:USC_CitizenshipEnum
name: "citizenshipStatus"
typeOf: schema:Property
domainIncludes: schema:Person

Node: dcid:disabilityStatus
rangeIncludes: dcs:USC_DisabilityStatusEnum
name: "disabilityStatus"
typeOf: schema:Property
domainIncludes: schema:Person

Node: collegeOrGraduateSchoolEnrollment
dcid: "collegeOrGraduateSchoolEnrollment"
Expand Down Expand Up @@ -97,6 +110,13 @@ rangeIncludes: schema:Number, dcs:Quantity, dcs:Percentile
name: "income"
domainIncludes: schema:Person

Node: householdIncome
dcid: "householdIncome"
typeOf: schema:Property
rangeIncludes: schema:Number, dcs:Quantity, dcs:Percentile
name: "householdIncome"
domainIncludes: schema:Person

Node: incomeStatus
typeOf: schema:Property
dcid: "incomeStatus"
Expand Down
8 changes: 4 additions & 4 deletions core/climate.mcf
Original file line number Diff line number Diff line change
Expand Up @@ -30,27 +30,27 @@ name: "pollutant"
Node: dcid:concentration
typeOf: schema:Property
domainIncludes: dcs:Atmosphere
rangeInclude: schema:Number
rangeIncludes: schema:Number
name: "concentration"

Node: dcid:airQualityIndex
typeOf: schema:Property
domainIncludes: dcs:Atmosphere
rangeInclude: schema:Number
rangeIncludes: schema:Number
name: "airQualityIndex"

Node: dcid:definingPollutant
typeOf: schema:Property
description: "Pollutant used for aggregate AQI measurement."
domainIncludes: dcs:Atmosphere
rangeInclude: dcs:AirPollutantEnum
rangeIncludes: dcs:AirPollutantEnum
name: "definingPollutant"

Node: dcid:definingAirQualitySite
typeOf: schema:Property
description: "AirQualitySite of aggregate AQI measurement."
domainIncludes: dcs:Atmosphere
rangeInclude: dcs:AirQualitySite
rangeIncludes: dcs:AirQualitySite
name: "definingAirQualitySite"

Node: dcid:pollutantHealthRisk
Expand Down
77 changes: 76 additions & 1 deletion core/dcschema.mcf
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,25 @@ domainIncludes: schema:Class
rangeIncludes: schema:Class
description: "Indicates Class hierarchy. For example, City is a subClassOf AdministrativeArea. Thus, instances of City are also instances of AdministrativeArea."

Node: dcid:subPropertyOf
name: "subPropertyOf"
typeOf: schema:Property
domainIncludes: schema:Property
rangeIncludes: schema:Property
description: "Indicates Property hierarchy."

Node: dcid:equivalentClass
name: "equivalentClass"
typeOf: schema:Property
domainIncludes: schema:Class
rangeIncludes: schema:Class

Node: dcid:equivalentProperty
name: "equivalentProperty"
typeOf: schema:Property
domainIncludes: schema:Property
rangeIncludes: schema:Property

Node: dcid:descriptionUrl
name: "descriptionUrl"
typeOf: schema:Property
Expand Down Expand Up @@ -231,7 +250,7 @@ Node: dcid:administrativeCapital
name: "administrativeCapital"
typeOf: schema:Property
description: "The municipality exercising primary status in a country, state, province, or other administrative region, usually as its seat of government."
descruptionUrl: "https://en.wikipedia.org/wiki/Capital_city"
descriptionUrl: "https://en.wikipedia.org/wiki/Capital_city"
rangeIncludes: schema:City, schema:Town
domainIncludes: schema:AdministrativeArea

Expand Down Expand Up @@ -2589,3 +2608,59 @@ Node: dcid:Years
typeOf: dcs:TimeUnitOfMeasure
name: "Years"
sameAs: dcs:Year

Node: dcid:causeOfDeath
typeOf: schema:Property
name: "causeOfDeath"
domainIncludes: schema:Person, schema:MortalityEvent
rangeIncludes: dcs:CauseOfDeathAndDisabilityEnum, dcs:ICD10_113CausesOfDeath, dcs:HealthOutcomeEnum

Node: dcid:testResult
typeOf: schema:Property
name: "testResult"
domainIncludes: dcs:MedicalTest
rangeIncludes: dcs:MedicalTestResultEnum

Node: dcid:economicSector
name: "economicSector"
typeOf: schema:Property
domainIncludes: schema:Person
rangeIncludes: dcs:NACEEnum

Node: dcid:workPeriod
name: "workPeriod"
typeOf: schema:Property
domainIncludes: schema:Person
rangeIncludes: dcs:QuantityRange

Node: dcid:workerStatus
name: "workerStatus"
typeOf: schema:Property
domainIncludes: schema:Person
rangeIncludes: dcs:WorkerClassificationEnum
supersededBy: dcs:workerClassification

Node: dcid:workStatus
name: "workStatus"
typeOf: schema:Property
domainIncludes: schema:Household
rangeIncludes: dcs:USC_WorkStatusEnum

Node: dcid:Vaccine
name: "Vaccine"
typeOf: schema:Class
subClassOf: schema:Thing
description: "A biological preparation that provides active acquired immunity to a particular infectious disease"
descriptionUrl: "https://en.wikipedia.org/wiki/Vaccine"

Node: dcid:vaccineStatus
name: "vaccineStatus"
typeOf: schema:Property
domainIncludes: dcs:Vaccine
rangeIncludes: dcs:VaccineStatusEnum

Node: dcid:closeMatch
name: "closeMatch"
typeOf: schema:Property
domainIncludes: schema:Thing
rangeIncludes: schema:Thing, schema:Text
10 changes: 9 additions & 1 deletion core/dcschema_enum_instances.mcf
Original file line number Diff line number Diff line change
Expand Up @@ -1283,7 +1283,7 @@ Node: dcid:InitialClaimExcludingIntrastateTransitional
typeOf: dcs:UnemploymentInsuranceClaimTypeEnum
name: "InitialClaimExcludingIntrastateTransitional"
description: "Used by State UI programs. Includes intrastate initial claims and interstate initial claims filed from the agent state, but not instrastate transitional claims."
descriptionUrL: "https://wdr.doleta.gov/directives/attach/ETAH/ETHand401_4th_s01.pdf"
descriptionUrl: "https://wdr.doleta.gov/directives/attach/ETAH/ETHand401_4th_s01.pdf"

Node: dcid:InitialClaim
typeOf: dcs:UnemploymentInsuranceClaimTypeEnum
Expand Down Expand Up @@ -1442,6 +1442,14 @@ name: "MarginalWorker"
description: "Marginal workers are those who had worked for less than 6 months in the one year preceding the date of enumeration."
descriptionUrl: "http://www.arthapedia.in/index.php?title=Worker_(Census_Definition)"

Node: dcid:Worker
typeOf: dcs:WorkerClassificationEnum
name: "Worker"

Node: dcid:NonWorker
typeOf: dcs:WorkerClassificationEnum
name: "NonWorker"

Node: dcid:EnrolledInEducationOrTraining
typeOf: dcs:EnrollmentStatusEnum
name: "EnrolledInEducationOrTraining"
2 changes: 1 addition & 1 deletion core/deepsolar.mcf
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ name: "SolarThermalInstallation"
Node: dcid:coverageArea
typeOf: schema:Property
domainIncludes: dcs:SolarInstallation
rangeInclude: schema:Number
rangeIncludes: schema:Number
name: "coverageArea"
4 changes: 2 additions & 2 deletions core/edu.mcf
Original file line number Diff line number Diff line change
Expand Up @@ -921,8 +921,8 @@ descriptionUrl: "https://nces.ed.gov/programs/edge/Demographic/ACSparents"
Node: dcid:iscedLevel
name: "iscedLevel"
typeOf: schema:Property
domain: dcs:SchoolGradeLevelEnum
range: schema:Text
domainIncludes: dcs:SchoolGradeLevelEnum
rangeIncludes: schema:Text
description: "The corresponding International Standard Classification of Education level of education."

Node: dcid:LessThanPrimaryEducation
Expand Down
12 changes: 12 additions & 0 deletions core/icd10.mcf
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,18 @@ dcid: dcs:ICD10Code
subClassOf: schema:Enumeration
name: "ICD10 2019 code"

Node: dcid:inclusionTerm
typeOf: schema:Property
domainIncludes: dcs:ICD10Code
rangeIncludes: schema:Text
name: "inclusionTerm"

Node: dcid:excludes
typeOf: schema:Property
domainIncludes: dcs:ICD10Code
rangeIncludes: schema:Text
name: "excludes"

Node: ICD10Section
typeOf: schema:Class
dcid: dcs:ICD10Section
Expand Down