scripting and *uuid.dat files to maintain persistent mRID values

Meas/constants.py

@@ -7,7 +7,9 @@
 # URL for blazegraph
 
 # Using the default blazegraph installation as a standalone
-blazegraph_url = "http://localhost:9999/blazegraph/namespace/kb/sparql"
+# blazegraph_url = "http://localhost:9999/blazegraph/namespace/kb/sparql"
+# Using the default blazegraph installation, dockerized from lyrasis
+blazegraph_url = "http://localhost:8889/bigdata/namespace/kb/sparql"
 
 # When running the platform in the docker, the blazegraph URL can be found in
 # /gridappsd/conf/pnnl.goss.gridappsd.cfg. At the time of writing (04/24/18),

README.md

@@ -22,27 +22,25 @@ The taxonomy feeders are modified, as described in the _taxonomy_ subdirectory.
 The _blazegraph_ subdirectory contains a Java program and script files
 to manage the feeder model conversions to and from CIM. [Maven](https://maven.apache.org/), [Java](https://java.com/en/download/), [Jena](https://jena.apache.org/) and [Commons Math](https://commons.apache.org/proper/commons-math/) are required.
 
-To set up and test the converter:
-
-1. Download the [Blazegraph jar file](https://www.blazegraph.com/download/)
-2. Make sure to run Java 8. There have been reports that Blazegraph isn't compatible with Java 9 yet.
-3. On Windows only, patch the configuration:
-   * Add to _rwstore.properties_ ```com.bigdata.rwstore.RWStore.readBlobsAsync=false```
-   * Invoke ```jar uf blazegraph.jar RWStore.properties```
-4. To start Blazegraph, invoke from a terminal ```java -server -Xmx4g -Dfile.encoding=UTF-8 -jar blazegraph.jar```
-5. Point a web browser to _http://localhost:9999/blazegraph_ 
-   * On-line help on Blazegraph is available from the browser
-6. Create the Blazegraph namespace _kb_ and use that for the rest of these examples
-   * You can use a different namespace, but you'll have to specify that using the -u option for the CIMImporter, handediting the default _-u=http://localhost:9999/blazegraph/namespace/kb/sparql_
+Blazegraph requires Java 8, which is no longer widely available for new installations.  Blazegraph isn't compatible with Java 9 or newer versions. Therefore, we recommend using Blazegraph in a Docker container:
+
+1. Install the [Docker Engine](https://docs.docker.com/install/)
+2. Issue commands that install and start the containerized Blazegraph engine:
+   * _docker pull lyrasis/blazegraph:2.1.5_ to download the container for Blazegraph, only necessary the first time
+   * _docker run --name blazegraph -d -p 8889:8080 lyrasis/blazegraph:2.1.5_ to start the container for Blazegraph
+   * _docker logs -f blazegraph_ to log the database and Java messages to the console
+   * consult the Docker documentation for more details on how to stop and otherwise manage containers
+3. Point a web browser to _http://localhost:8889/bigdata_. On-line help on Blazegraph is available from the browser
+4. Load some data from a CIM XML file, or any other XML triple-store
+5. Run a query in the browser
+   * the file _queries.txt_ contains sample SPARQL that can be pasted into the Blazegraph browser window
+6. Verify that the Blazegraph namespace is _kb_ and use that for the rest of these examples
+   * You can use a different namespace, but you'll have to specify that using the -u option for the CIMImporter, handediting the default _-u=http://localhost:8889/bigdata/namespace/kb/sparql_
    * You can use a different namespace, but you may have to hand-edit some of the Python files (e.g. under the Meas directory)
    * The GridAPPS-D platform itself may use a different namespace
-7. Load some data from a CIM XML file, or any other XML triple-store
-8. Run a query in the browser
-   * the file _queries.txt_ contains sample SPARQL that can be pasted into the Blazegraph browser window
 
 Helper scripts on Windows:
 
-* _go.bat_ starts Blazegraph, like item 4 above
 * _compile.bat_ recompiles the Java CIM Importer; this step can't be included within _import.bat_ on Windows
 * _drop\_all.bat_ empties the triple-store
 * _import.bat_ will run the Java importer against the triple-store. Within this file:
@@ -53,7 +51,6 @@ Helper scripts on Windows:
 
 Helper scripts for Linux/Mac OS X:
 
-* _start\_server.sh_ starts Blazegraph, like item 4 above
 * _import.sh_ will compile and run the Java importer against the triple-store. Within this file:
   * the ```-o=dss``` option creates an OpenDSS model from CIM
   * the ```-o=glm``` option creates a GridLAB-D model from CIM 
@@ -76,7 +73,7 @@ Usage and options for ```java gov.pnnl.goss.cim2glm.CIMImporter [options] output
 * ```-h={0..1}          // determine if house load objects should be added to supplement EnergyConsumers```
 * ```-x={0, 1}          // indicate whether for glm, the model will be called with a fault_check already created```
 * ```-t={0, 1}          // request timing of top-level methods and SPARQL queries, requires -o=both for methods```
-* ```-u={http://localhost:9999/blazegraph/namespace/kb/sparql} // blazegraph uri (if connecting over HTTP); defaults to http://localhost:9999/blazegraph/namespace/kb/sparql```
+* ```-u={http://localhost:8889/bigdata/namespace/kb/sparql} // blazegraph uri (if connecting over HTTP); defaults to http://localhost:8889/bigdata/namespace/kb/sparql```
 
 ## GridAPPS-D Feeder Models
 

blazegraph/MakeLoopScript.py

@@ -20,21 +20,21 @@ def append_xml_case(casefiles, xmlpath, outpath, fp):
             print('call drop_all.bat', file=fp)
             print('curl -D- -H "Content-Type: application/xml" --upload-file', 
                   xmlpath + c + '.xml',
-                  '-X POST "http://localhost:9999/blazegraph/sparql"', file=fp)
+                  '-X POST "http://localhost:8889/bigdata/sparql"', file=fp)
             print('java gov.pnnl.goss.cim2glm.CIMImporter -o=both -l=1.0 -i=1', 
                   outpath + c, file=fp)
         elif sys.platform == 'linux':
             print('./drop_all.sh', file=fp)
             print('curl -D- -H "Content-Type: application/xml" --upload-file', 
                   xmlpath + c + '.xml',
-                  '-X POST "http://localhost:9999/blazegraph/sparql"', file=fp)
+                  '-X POST "http://localhost:8889/bigdata/sparql"', file=fp)
             print('java -classpath "target/*:/home/tom/src/apache-jena-3.13.1/lib/*:/home/tom/src/commons-math3-3.6.1/*" gov.pnnl.goss.cim2glm.CIMImporter -o=both -l=1.0 -i=1', 
                   outpath + c, file=fp)
         else:
             print('./drop_all.sh', file=fp)
             print('curl -D- -H "Content-Type: application/xml" --upload-file', 
                   xmlpath + c + '.xml',
-                  '-X POST "http://localhost:9999/blazegraph/sparql"', file=fp)
+                  '-X POST "http://localhost:8889/bigdata/sparql"', file=fp)
             print('java -classpath "target/*:/Users/mcde601/src/apache-jena-3.6.0/lib/*:/Users/mcde601/src/commons-math3-3.6.1/*" gov.pnnl.goss.cim2glm.CIMImporter -o=both -l=1.0 -i=1', 
                   outpath + c, file=fp)
 

blazegraph/cim2glm.bnd

@@ -1,4 +1,4 @@
-Bundle-Version: 18.0.1
+Bundle-Version: 18.0.2
 Private-Package: \
 	gov.pnnl.goss.cim2glm.components,\
 	gov.pnnl.goss.cim2glm.queryhandler.impl

blazegraph/convert_eval.sh

@@ -3,7 +3,7 @@ mkdir /Users/mcde601/src/GRIDAPPSD/Powergrid-Models/blazegraph/glm/
 rm /Users/mcde601/src/GRIDAPPSD/Powergrid-Models/blazegraph/dss/*.*
 rm /Users/mcde601/src/GRIDAPPSD/Powergrid-Models/blazegraph/glm/*.*
 ./drop_all.sh
-curl -D- -H "Content-Type: application/xml" --upload-file /Users/mcde601/src/GRIDAPPSD/Powergrid-Models/blazegraph/test/IEEE8500_3subs.xml -X POST "http://localhost:9999/blazegraph/sparql"
+curl -D- -H "Content-Type: application/xml" --upload-file /Users/mcde601/src/GRIDAPPSD/Powergrid-Models/blazegraph/test/IEEE8500_3subs.xml -X POST "http://localhost:8889/bigdata/sparql"
 java -classpath "target/*:/Users/mcde601/src/apache-jena-3.6.0/lib/*:/Users/mcde601/src/commons-math3-3.6.1/*" gov.pnnl.goss.cim2glm.CIMImporter -o=dss -l=1.0 -i=1 /Users/mcde601/src/GRIDAPPSD/Powergrid-Models/blazegraph/dss/IEEE8500_3subs
 java -classpath "target/*:/Users/mcde601/src/apache-jena-3.6.0/lib/*:/Users/mcde601/src/commons-math3-3.6.1/*" gov.pnnl.goss.cim2glm.CIMImporter -o=glm -l=1.0 -i=1 /Users/mcde601/src/GRIDAPPSD/Powergrid-Models/blazegraph/glm/IEEE8500_3subs
 

blazegraph/drop_all.bat

@@ -1 +1 @@
-curl -D- -X POST "http://localhost:9999/blazegraph/sparql" --data-urlencode "update=drop all"
+curl -D- -X POST "http://localhost:8889/bigdata/sparql" --data-urlencode "update=drop all"

blazegraph/drop_all.sh

@@ -1 +1 @@
-curl -D- -X POST "http://localhost:9999/blazegraph/sparql" --data-urlencode "update=drop all"
+curl -D- -X POST "http://localhost:8889/bigdata/sparql" --data-urlencode "update=drop all"

blazegraph/export.bat

@@ -1,5 +1,5 @@
 set CLASSPATH=target/*;c:/apache-jena-3.6.0/lib/*;c:/commons-math3-3.6.1/*
 java gov.pnnl.goss.cim2glm.CIMImporter ^
- -u=http://localhost:9999/blazegraph/namespace/kb/sparql ^
+ -u=http://localhost:8889/bigdata/namespace/kb/sparql ^
  -s=_E407CBB6-8C8D-9BC9-589C-AB83FBF0826D -o=cim ieee123pvcim
 

blazegraph/import.bat

@@ -1,24 +1,19 @@
-set CLASSPATH=target/libs/*;target/cim2glm-0.0.1-SNAPSHOT.jar
-
-java gov.pnnl.goss.cim2glm.CIMImporter -u=http://localhost:8889/bigdata/namespace/kb/sparql -o=idx directory
-
-echo off
-
-rem java -agentpath:C:/Java/jdk1.8.0_192/lib/visualvm/profiler/lib/deployed/jdk16/windows-amd64/profilerinterface.dll=C:\Java\jdk1.8.0_192\lib\visualvm\profiler\lib,5140 gov.pnnl.goss.cim2glm.CIMImporter ^
-rem  -u=http://localhost:9999/blazegraph/namespace/kb/sparql ^
-rem  -s=_AAE94E4A-2465-6F5E-37B1-3E72183A4E44 ^
-rem  -o=both -l=1.0 -i=1 -x=0 eval
-
+set CLASSPATH=target/*;c:/apache-jena-3.6.0/lib/*;c:/commons-math3-3.6.1/*
+rem java gov.pnnl.goss.cim2glm.CIMImporter -o=idx directory
+java -agentpath:C:/Java/jdk1.8.0_192/lib/visualvm/profiler/lib/deployed/jdk16/windows-amd64/profilerinterface.dll=C:\Java\jdk1.8.0_192\lib\visualvm\profiler\lib,5140 gov.pnnl.goss.cim2glm.CIMImporter ^
+ -u=http://localhost:8889/bigdata/namespace/kb/sparql ^
+ -s=_AAE94E4A-2465-6F5E-37B1-3E72183A4E44 ^
+ -o=both -l=1.0 -i=1 -x=0 eval
 rem java gov.pnnl.goss.cim2glm.CIMImporter ^
-rem  -u=http://localhost:9999/blazegraph/namespace/kb/sparql ^
+rem  -u=http://localhost:8889/bigdata/namespace/kb/sparql ^
 rem  -s=_E407CBB6-8C8D-9BC9-589C-AB83FBF0826D -o=glm -l=1.0 -i=1 ieee123pv
 rem java gov.pnnl.goss.cim2glm.CIMImporter ^
-rem  -u=http://localhost:9999/blazegraph/namespace/kb/sparql ^
+rem  -u=http://localhost:8889/bigdata/namespace/kb/sparql ^
 rem  -s=_E407CBB6-8C8D-9BC9-589C-AB83FBF0826D -o=dss -l=1.0 ieee123pv
 rem java gov.pnnl.goss.cim2glm.CIMImporter ^
-rem  -u=http://localhost:9999/blazegraph/namespace/kb/sparql ^
+rem  -u=http://localhost:8889/bigdata/namespace/kb/sparql ^
 rem  -s=_77966920-E1EC-EE8A-23EE-4EFD23B205BD -o=dss -l=1.0 ieee3sub
 rem java gov.pnnl.goss.cim2glm.CIMImporter ^
-rem  -u=http://localhost:9999/blazegraph/namespace/kb/sparql ^
+rem  -u=http://localhost:8889/bigdata/namespace/kb/sparql ^
 rem  -s=_77966920-E1EC-EE8A-23EE-4EFD23B205BD -o=glm -l=1.0 -i=1 ieee3sub
 

blazegraph/import.sh

@@ -4,7 +4,74 @@ mvn clean install
 java -cp "target/libs/*:target/cim2glm-0.0.1-SNAPSHOT.jar" gov.pnnl.goss.cim2glm.CIMImporter -u=http://localhost:8889/bigdata/namespace/kb/sparql \
     -o=idx directory
 
-# CIM100 testing with 9500-node feeder; OpenDSS, GridLAB-D and GridLAB-D without houses
-# java -cp "target/libs/*:target/cim2glm-0.0.1-SNAPSHOT.jar" gov.pnnl.goss.cim2glm.CIMImporter -u=http://localhost:8889/bigdata/namespace/kb/sparql \
+java -classpath "target/*:/Users/mcde601/src/apache-jena-3.6.0/lib/*:/Users/mcde601/src/commons-math3-3.6.1/*" gov.pnnl.goss.cim2glm.CIMImporter \
+   -s=_49AD8E07-3BF9-A4E2-CB8F-C3722F837B62 -o=both -l=1.0 -i=1 ieee13
+
+# CIM100 testing with 9500-node feeder; OpenDSS, GridLAB-D and GridLAB-D with houses
+#java -classpath "target/*:/Users/mcde601/src/apache-jena-3.6.0/lib/*:/Users/mcde601/src/commons-math3-3.6.1/*" gov.pnnl.goss.cim2glm.CIMImporter \
 #     -s=_AAE94E4A-2465-6F5E-37B1-3E72183A4E44 -o=both -l=1.0 -i=1 -h=0 -x=0 -t=1 eval
 
+# CIM100 testing with Transactive feeder; OpenDSS, GridLAB-D and GridLAB-D with houses
+#java -classpath "target/*:/Users/mcde601/src/apache-jena-3.6.0/lib/*:/Users/mcde601/src/commons-math3-3.6.1/*" gov.pnnl.goss.cim2glm.CIMImporter \
+#     -s=_503D6E20-F499-4CC7-8051-971E23D0BF79 -o=dss -l=1.0 -i=1 transactive
+#java -classpath "target/*:/Users/mcde601/src/apache-jena-3.6.0/lib/*:/Users/mcde601/src/commons-math3-3.6.1/*" gov.pnnl.goss.cim2glm.CIMImporter \
+#     -s=_503D6E20-F499-4CC7-8051-971E23D0BF79 -o=glm -l=1.0 -i=1 -x=0 transactive
+#java -classpath "target/*:/Users/mcde601/src/apache-jena-3.6.0/lib/*:/Users/mcde601/src/commons-math3-3.6.1/*" gov.pnnl.goss.cim2glm.CIMImporter \
+#     -s=_503D6E20-F499-4CC7-8051-971E23D0BF79 -o=glm -l=1.0 -i=1 -h=1 transactiveHouse
+
+# CIM100 testing with 9500-node feeder; OpenDSS, GridLAB-D and GridLAB-D with houses
+#java -classpath "target/*:/Users/mcde601/src/apache-jena-3.6.0/lib/*:/Users/mcde601/src/commons-math3-3.6.1/*" gov.pnnl.goss.cim2glm.CIMImporter \
+#     -s=_AAE94E4A-2465-6F5E-37B1-3E72183A4E44 -o=dss -l=1.0 -i=1 eval
+#java -classpath "target/*:/Users/mcde601/src/apache-jena-3.6.0/lib/*:/Users/mcde601/src/commons-math3-3.6.1/*" gov.pnnl.goss.cim2glm.CIMImporter \
+#     -s=_AAE94E4A-2465-6F5E-37B1-3E72183A4E44 -o=glm -l=1.0 -i=1 -x=0 eval
+#java -classpath "target/*:/Users/mcde601/src/apache-jena-3.6.0/lib/*:/Users/mcde601/src/commons-math3-3.6.1/*" gov.pnnl.goss.cim2glm.CIMImporter \
+#     -s=_AAE94E4A-2465-6F5E-37B1-3E72183A4E44 -o=glm -l=1.0 -i=1 -h=1 evalHouse
+
+#java -classpath "target/*:/Users/mcde601/src/apache-jena-3.6.0/lib/*:/Users/mcde601/src/commons-math3-3.6.1/*" gov.pnnl.goss.cim2glm.CIMImporter \
+#  -s=_E407CBB6-8C8D-9BC9-589C-AB83FBF0826D -o=glm -l=1.0 -i=1 ieee123pv
+#java -classpath "target/*:/Users/mcde601/src/apache-jena-3.6.0/lib/*:/Users/mcde601/src/commons-math3-3.6.1/*" gov.pnnl.goss.cim2glm.CIMImporter \
+#  -s=_E407CBB6-8C8D-9BC9-589C-AB83FBF0826D -o=dss -l=1.0 -i=1 ieee123pv
+
+# CIM100 testing with single-phase generator
+#java -classpath "target/*:/Users/mcde601/src/apache-jena-3.6.0/lib/*:/Users/mcde601/src/commons-math3-3.6.1/*" gov.pnnl.goss.cim2glm.CIMImporter \
+#     -s=_AAE94E4A-2465-6F5E-37B1-3E72183A4E44 -o=dss -l=1.0 -i=1 ieee8500_3subs
+#java -classpath "target/*:/Users/mcde601/src/apache-jena-3.6.0/lib/*:/Users/mcde601/src/commons-math3-3.6.1/*" gov.pnnl.goss.cim2glm.CIMImporter \
+#     -s=_AAE94E4A-2465-6F5E-37B1-3E72183A4E44 -o=glm -l=1.0 -i=1 ieee8500_3subs
+
+# CIM100 testing
+#java -classpath "target/*:/Users/mcde601/src/apache-jena-3.6.0/lib/*:/Users/mcde601/src/commons-math3-3.6.1/*" gov.pnnl.goss.cim2glm.CIMImporter \
+#   -s=_49AD8E07-3BF9-A4E2-CB8F-C3722F837B62 -o=glm -l=1.0 -i=1 ieee13
+#java -classpath "target/*:/Users/mcde601/src/apache-jena-3.6.0/lib/*:/Users/mcde601/src/commons-math3-3.6.1/*" gov.pnnl.goss.cim2glm.CIMImporter \
+#   -s=_49AD8E07-3BF9-A4E2-CB8F-C3722F837B62 -o=dss ieee13
+#java -classpath "target/*:/Users/mcde601/src/apache-jena-3.6.0/lib/*:/Users/mcde601/src/commons-math3-3.6.1/*" gov.pnnl.goss.cim2glm.CIMImporter \
+#   -s=_49AD8E07-3BF9-A4E2-CB8F-C3722F837B62 -o=dss -n=ieeezipload ieee13play
+#java -classpath "target/*:/Users/mcde601/src/apache-jena-3.6.0/lib/*:/Users/mcde601/src/commons-math3-3.6.1/*" gov.pnnl.goss.cim2glm.CIMImporter \
+#   -s=_5B816B93-7A5F-B64C-8460-47C17D6E4B0F -o=glm -l=1.0 -i=1 ieee13assets
+#java -classpath "target/*:/Users/mcde601/src/apache-jena-3.6.0/lib/*:/Users/mcde601/src/commons-math3-3.6.1/*" gov.pnnl.goss.cim2glm.CIMImporter \
+#   -s=_5B816B93-7A5F-B64C-8460-47C17D6E4B0F -o=dss ieee13assets
+
+# CIM100 testing with houses
+#java -classpath "target/*:/Users/mcde601/src/apache-jena-3.6.0/lib/*:/Users/mcde601/src/commons-math3-3.6.1/*" gov.pnnl.goss.cim2glm.CIMImporter \
+#     -s=_9CE150A8-8CC5-A0F9-B67E-BBD8C79D3095 -o=glm -l=1.0 -i=1 -h=1 taxR2_2house
+#java -classpath "target/*:/Users/mcde601/src/apache-jena-3.6.0/lib/*:/Users/mcde601/src/commons-math3-3.6.1/*" gov.pnnl.goss.cim2glm.CIMImporter \
+#     -s=_4F76A5F9-271D-9EB8-5E31-AA362D86F2C3 -o=glm -l=1.0 -i=1 -h=1 ieee8500house
+
+# circuits used in GridAPPS-D
+
+#java -classpath "target/*:/Users/mcde601/src/apache-jena-3.6.0/lib/*:/Users/mcde601/src/commons-math3-3.6.1/*" gov.pnnl.goss.cim2glm.CIMImporter -s=_77966920-E1EC-EE8A-23EE-4EFD23B205BD -o=glm -l=1.0 -i=1 acep_psil
+#java -classpath "target/*:/Users/mcde601/src/apache-jena-3.6.0/lib/*:/Users/mcde601/src/commons-math3-3.6.1/*" gov.pnnl.goss.cim2glm.CIMImporter -s=_77966920-E1EC-EE8A-23EE-4EFD23B205BD -o=dss acep_psil
+#java -classpath "target/*:/Users/mcde601/src/apache-jena-3.6.0/lib/*:/Users/mcde601/src/commons-math3-3.6.1/*" gov.pnnl.goss.cim2glm.CIMImporter -s=_E407CBB6-8C8D-9BC9-589C-AB83FBF0826D -o=glm -l=1.0 -i=1 ieee123pv
+#java -classpath "target/*:/Users/mcde601/src/apache-jena-3.6.0/lib/*:/Users/mcde601/src/commons-math3-3.6.1/*" gov.pnnl.goss.cim2glm.CIMImporter -s=_9CE150A8-8CC5-A0F9-B67E-BBD8C79D3095 -o=glm -l=1.0 -i=1 taxR2_2
+#java -classpath "target/*:/Users/mcde601/src/apache-jena-3.6.0/lib/*:/Users/mcde601/src/commons-math3-3.6.1/*" gov.pnnl.goss.cim2glm.CIMImporter -s=_9CE150A8-8CC5-A0F9-B67E-BBD8C79D3095 -o=glm -l=1.0 -i=1 -h=1 taxR2_2house
+#java -classpath "target/*:/Users/mcde601/src/apache-jena-3.6.0/lib/*:/Users/mcde601/src/commons-math3-3.6.1/*" gov.pnnl.goss.cim2glm.CIMImporter -s=_C1C3E687-6FFD-C753-582B-632A27E28507 -o=glm -l=1.0 -i=1 ieee123
+#java -classpath "target/*:/Users/mcde601/src/apache-jena-3.6.0/lib/*:/Users/mcde601/src/commons-math3-3.6.1/*" gov.pnnl.goss.cim2glm.CIMImporter -s=_49AD8E07-3BF9-A4E2-CB8F-C3722F837B62 -o=glm -l=1.0 -i=1 ieee13
+#java -classpath "target/*:/Users/mcde601/src/apache-jena-3.6.0/lib/*:/Users/mcde601/src/commons-math3-3.6.1/*" gov.pnnl.goss.cim2glm.CIMImporter -s=_5B816B93-7A5F-B64C-8460-47C17D6E4B0F -o=glm -l=1.0 -i=1 ieee13assets
+#java -classpath "target/*:/Users/mcde601/src/apache-jena-3.6.0/lib/*:/Users/mcde601/src/commons-math3-3.6.1/*" gov.pnnl.goss.cim2glm.CIMImporter -s=_4F76A5F9-271D-9EB8-5E31-AA362D86F2C3 -o=glm -l=1.0 -i=1 ieee8500
+#java -classpath "target/*:/Users/mcde601/src/apache-jena-3.6.0/lib/*:/Users/mcde601/src/commons-math3-3.6.1/*" gov.pnnl.goss.cim2glm.CIMImporter -s=_4F76A5F9-271D-9EB8-5E31-AA362D86F2C3 -o=glm -l=1.0 -i=1 -h=1 ieee8500house
+#java -classpath "target/*:/Users/mcde601/src/apache-jena-3.6.0/lib/*:/Users/mcde601/src/commons-math3-3.6.1/*" gov.pnnl.goss.cim2glm.CIMImporter -s=_67AB291F-DCCD-31B7-B499-338206B9828F -o=glm -l=1.0 -i=1 epriJ1
+
+# other test cases not used in GridAPPS-D
+
+#java -classpath "target/*:/Users/mcde601/src/apache-jena-3.6.0/lib/*:/Users/mcde601/src/commons-math3-3.6.1/*" gov.pnnl.goss.cim2glm.CIMImporter -s=_49003F52-A359-C2EA-10C4-F4ED3FD368CC -o=glm -l=1.0 -i=1 ieee37
+
+

blazegraph/src/main/java/gov/pnnl/goss/cim2glm/CIMImporter.java

@@ -2019,7 +2019,7 @@ public static void main (String args[]) throws FileNotFoundException {
 		String fTarget = "dss";
 		String feeder_mRID = "";
 		double Zcoeff = 0.0, Icoeff = 0.0, Pcoeff = 0.0;
-		String blazegraphURI = "http://localhost:9999/blazegraph/namespace/kb/sparql";
+		String blazegraphURI = "http://localhost:8889/bigdata/namespace/kb/sparql";
 		if (args.length < 1) {
 			System.out.println ("Usage: java CIMImporter [options] output_root");
 			System.out.println ("       -s={mRID}          // select one feeder by CIM mRID; selects all feeders if not specified");
@@ -2034,7 +2034,7 @@ public static void main (String args[]) throws FileNotFoundException {
 			System.out.println ("       -h={0, 1}          // determine if house load objects should be added to the model or not");
 			System.out.println ("       -x={0, 1}          // indicate whether for glm, the model will be called with a fault_check already created");
 			System.out.println ("       -t={0, 1}          // request timing of top-level methods and SPARQL queries, requires -o=both for methods");
-			System.out.println ("       -u={http://localhost:9999/blazegraph/namespace/kb/sparql} // blazegraph uri (if connecting over HTTP); defaults to http://localhost:9999/blazegraph/namespace/kb/sparql");
+			System.out.println ("       -u={http://localhost:8889/bigdata/namespace/kb/sparql} // blazegraph uri (if connecting over HTTP); defaults to http://localhost:8889/bigdata/namespace/kb/sparql");
 
 			System.out.println ("Example 1: java CIMImporter -l=1 -i=1 -n=zipload_schedule ieee8500");
 			System.out.println ("   assuming Jena and Commons-Math are in Java's classpath, this will produce two output files");