-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #90 from VladimirAlexiev/develop
implement a bunch of fixes (not applied to ontologies yet)
- Loading branch information
Showing
76 changed files
with
67,346 additions
and
36,736 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
RDF = $(wildcard test/rdf/*) | ||
TRIG = $(patsubst test/rdf/%.xml, test/trig/%.trig, $(RDF)) | ||
|
||
all: $(TRIG) | ||
|
||
test/trig/%.trig: cim-trig.pl test/rdf/%.xml | ||
perl $^ $@ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
|
||
## Add Datatypes To Instance Data | ||
https://github.com/Sveino/Inst4CIM-KG/issues/49 | ||
|
||
In CGMES instance data, all literals are string, but should be marked with the appropriate datatype. | ||
- E.g. `cim:ACDCConverter.baseS` should be marked `^^xsd:float` | ||
- Otherwise sort won't work and range queries will be slower. | ||
- This pertains to `boolean, dateTme, float, gMonthDay, integer` as `string` is the default datatype | ||
|
||
This query counts props by XSD datatype: | ||
```sparql | ||
PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> | ||
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> | ||
select ?range (count(*) as ?c) { | ||
?x rdfs:range ?range | ||
filter(strstarts(str(?range), str(xsd:))) | ||
} group by ?range order by ?range | ||
``` | ||
|
||
Here are the current results, but it should be rerun after fixes to ontology: see col "comment" | ||
| range | c | comment | | ||
|---------------|-----|-------------------------------------------------------------------------------------| | ||
| xsd:boolean | 218 | Inflated because meta-data props are duplicated, and many are boolean | | ||
| xsd:dateTime | 5 | | | ||
| xsd:decimal | 1 | | | ||
| xsd:float | 310 | Deflated because eg `cim:ActivePower.value` may be used by hundreds of "real" props | | ||
| xsd:gMonthDay | 2 | | | ||
| xsd:integer | 36 | | | ||
| xsd:string | 51 | | | ||
|
||
I have a tentative SPARQL Update, but need to revise it. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,104 @@ | ||
#!perl -w | ||
# Convert CIM xml file to trig (turtle with graphs). | ||
|
||
# Assumptions: | ||
# - Relies on a repeatable CIM XML layout as lines (uses simple string manipulation). | ||
# If needed, I can change it to work with proper XML access. This module seems suitable: | ||
# use XML::DT; # https://metacpan.org/pod/XML::DT | ||
# - A file has exactly one model: md:FullModel or dm:DifferenceModel | ||
# - dm:DifferenceModel has exactly two sections dm:reverseDifferences and dm:forwardDifferences in this order | ||
# - Uses "owl write" (non-streaming) for nicer formatting | ||
# - Or jena riot in --formatted mode (non-streaming). For very large files, we should switch to --output | ||
|
||
use warnings; | ||
use autodie; | ||
use UUID qw(uuid4); # https://metacpan.org/pod/UUID | ||
# CIM UUIDs are version 4: https://github.com/Sveino/Spec4CIM-KG/issues/10 | ||
|
||
# owl.bat prints some junk on STDERR that I can't suppress on Cygwin, so we need to use explicit in/out filenames | ||
my $in = shift; | ||
my $out = shift or die "Usage: $0 in.rdf out.trig\n"; | ||
open(STDIN,$in); | ||
|
||
# slurp STDIN | ||
$/ = undef; | ||
my $xml = <STDIN>; | ||
|
||
# remove parasitic underscore from start of relative URLs | ||
$xml =~ s{(rdf:(about|resource)=\"#)_+}{$1}g; | ||
|
||
# break it up | ||
my ($rdf_open, $body, $rdf_close) = | ||
$xml =~ m{(.*?<rdf:RDF.*?>)(.*?)(</rdf:RDF>)}s | ||
or die "Can't find rdf:RDF element\n"; | ||
my ($model, $model_type, $model_uri, $rest) = | ||
$body =~ m{(<(md:FullModel|dm:DifferenceModel) rdf:about="(.*?)".*?</\2>)(.*)}s | ||
or die "Can't find md:FullModel or dm:DifferenceModel\n"; | ||
|
||
# Add base | ||
my ($base) = | ||
$model =~ m{<md:Model.modelingAuthoritySet>(.*?)<} | ||
or die "Can't find md:Model.modelingAuthoritySet\n"; | ||
$rdf_open =~ s{<rdf:RDF}{<rdf:RDF xml:base="$base"}; | ||
|
||
if ($model_type eq "dm:DifferenceModel") { | ||
my ($model_open, $reverse, $forward, $model_close) = | ||
$model =~ m{(.*?) | ||
\s*<dm:reverseDifferences rdf:parseType="Statements">(.*?)</dm:reverseDifferences> | ||
\s*<dm:forwardDifferences rdf:parseType="Statements">(.*?)</dm:forwardDifferences> | ||
(.*)}s | ||
or die "Can't find dm:reverseDifferences FOLLOWED BY dm:forwardDifferences\n"; | ||
my $reverse_uri = "urn:uri:" . uuid4(); | ||
my $forward_uri = "urn:uri:" . uuid4(); | ||
my $reverse_ref = qq{<dm:reverseDifferences rdf:resource="$reverse_uri"/>}; | ||
my $forward_ref = qq{<dm:forwardDifferences rdf:resource="$forward_uri"/>}; | ||
$model = ttl("$rdf_open$model_open$reverse_ref$forward_ref$model_close$rdf_close"); | ||
$reverse = ttl_no_prefixes("$rdf_open$reverse$rdf_close"); | ||
$forward = ttl_no_prefixes("$rdf_open$forward$rdf_close"); | ||
$output = qq{ | ||
$model | ||
<$reverse_uri> { # reverseDifferences | ||
$reverse | ||
} | ||
<$forward_uri> { # forwardDifferences | ||
$forward | ||
}}} else { | ||
$model = ttl("$rdf_open$model$rdf_close"); | ||
$rest = ttl_no_prefixes("$rdf_open$rest$rdf_close"); | ||
$output = qq{ | ||
$model | ||
<$model_uri> { # model content | ||
$rest | ||
}}}; | ||
|
||
open(STDOUT,">$out"); | ||
print $output; | ||
|
||
sub ttl { | ||
# https://perldoc.perl.org/functions/open#Opening-a-filehandle-into-a-command | ||
my $input = shift; | ||
my $fh; | ||
my $tmp = "tmp$$"; | ||
open ($fh,">$tmp.rdf"); | ||
print $fh $input; | ||
close $fh; | ||
system("owl.bat write --keepUnusedPrefixes -i rdfxml $tmp.rdf $tmp.ttl"); | ||
## riot.bat --syntax=rdfxml --formatted=ttl $infile > $outfile | ||
open ($fh, "$tmp.ttl"); | ||
my $output = <$fh>; # $/ is undef, so it slurps | ||
close $fh; | ||
unlink "$tmp.rdf"; | ||
unlink "$tmp.ttl"; | ||
$output | ||
} | ||
|
||
sub ttl_no_prefixes { | ||
my $x = ttl(shift); | ||
$x =~ s{\@prefix.*}{}g; | ||
$x =~ s{^\n+}{}g; | ||
$x =~ s{\n+$}{}g; | ||
$x | ||
} |
Oops, something went wrong.