search

USGCRP / gcis-ontology

Ontology for the Global Change Information System
4 stars 7 forks source link

Added InstrumentType class, updated definition of Instrument. #93

Closed zednis closed 9 years ago

zednis commented 9 years ago

references #35.

zednis commented 9 years ago

I am not sure if gcis:sourceInstrument, gcis:hasInstrument, and or gcis:inPlatform should reference gcis:Instrument or gcis:InstrumentType.

For the moment they are referencing gcis:Instrument so they would be used with RDF instance that describe physical instruments.

justgo129 commented 9 years ago

@rewolfe ?

justgo129 commented 9 years ago

@zednis when you get a chance could you please resolve the conflicts, after which I'll close this ticket? Thanks.

zednis commented 9 years ago

@justgo129 I have merged master into this branch and resolved the conflict.

justgo129 commented 9 years ago

@zednis would we need to repush this due to the jena issue, or did our resolution of it automatically cause these checks to rerun, during which they failed?

zednis commented 9 years ago

I will need to merge the recent update to travis-ci config into the branch for it to use the new configuration in it's checks.

zednis commented 9 years ago

I have merged the new Travis-CI config into this branch. CI checks should hopefully pass now...

justgo129 commented 9 years ago

They sure do. Merged #93. Thanks, @zednis.