Changed timeStamp to timestamp in node and edge specification

Author: Larry Holder

README.md

@@ -66,7 +66,7 @@ A vertex instance is a JSON object with name "vertex" and whose value is a JSON
 
 * **id**: An integer id (as a string) automatically generated by GSG that uniquely identifies this vertex in all streams in which it appears, and in the instances file if part of an instance of a tracked pattern.
 * **attributes**: A JSON object of name/value pairs, where both the name and value are strings. These are merely copied from the attributes defined for this vertex in the input pattern.
-* **timeStamp**: A string representing the time at which this vertex was written to the stream. The format is dictated by the *outputTimeFormat* parameter.
+* **timestamp**: A string representing the time at which this vertex was written to the stream. The format is dictated by the *outputTimeFormat* parameter.
 
 ### Edge Instance
 
@@ -78,7 +78,7 @@ object with the following properties.
 * **target**: Vertex identifier string for the edge's target vertex instance.
 * **directed**: Whether the edge is directed from source to target ("true"), or undirected ("false"). Same as defined in the input pattern.
 * **attributes**: A JSON object of name/value pairs, where both the name and value are strings. These are merely copied from the attributes defined for this edge in the input pattern.
-* **timeStamp**: A string representing the time at which this edge was written
+* **timestamp**: A string representing the time at which this edge was written
  to the stream. The format is dictated by the *outputTimeFormat* parameter.
 
 ## Output Instances File

gExportGraphML.py

@@ -15,10 +15,10 @@ def generateGraphML(inputFileName):
                  'http://graphml.graphdrawing.org/xmlns/1.0/graphml.xsd">\n')
 
     target.write('<key id="label" for="node" attr.name="label" attr.type="string"/>\n')
-    target.write('<key id="timeStamp" for="node" attr.name="timeStamp" attr.type="string"/>\n')
+    target.write('<key id="timestamp" for="node" attr.name="timestamp" attr.type="string"/>\n')
 
     target.write('<key id="label" for="edge" attr.name="label" attr.type="string"/>\n')
-    target.write('<key id="timeStamp" for="edge" attr.name="timeStamp" attr.type="string"/>\n')
+    target.write('<key id="timestamp" for="edge" attr.name="timestamp" attr.type="string"/>\n')
     target.write('<key id="directed" for="edge" attr.name="directed" attr.type="string"/>\n')
 
     target.write('<graph id="GSG_V1" edgedefault="directed">\n')
@@ -41,12 +41,12 @@ def generateGraphML(inputFileName):
                         target.write(twoIndent +'<data key='+ key.strip() + '>' + val.strip() + '</data>\n')
 
                     # Get Timestamp
-                    timestampLine = next(infile) #     "timeStamp": "5"}},\n
-                    vTimestamp = timestampLine.split('"timeStamp": ')[1][:-4]
-                    # Very last timeStamp entry does not end with "," which make the subscript invalid
+                    timestampLine = next(infile) #     "timestamp": "5"}},\n
+                    vTimestamp = timestampLine.split('"timestamp": ')[1][:-4]
+                    # Very last timestamp entry does not end with "," which make the subscript invalid
                     if vTimestamp.endswith('"') == False:
                         vTimestamp = vTimestamp + '"'
-                    target.write(twoIndent +'<data key="timeStamp">' + vTimestamp + '</data>\n')
+                    target.write(twoIndent +'<data key="timestamp">' + vTimestamp + '</data>\n')
                     target.write(oneIndent +'</node>\n')
 
                 elif line.startswith('  {"edge": {'):
@@ -79,13 +79,13 @@ def generateGraphML(inputFileName):
                     target.write(twoIndent +'<data key="directed">' + eDir + '</data>\n')
 
                     # Get Timestamp
-                    timestampLine = next(infile) #     "timeStamp": "5"}},\n
-                    eTimestamp = timestampLine.split('"timeStamp": ')[1][:-4]
+                    timestampLine = next(infile) #     "timestamp": "5"}},\n
+                    eTimestamp = timestampLine.split('"timestamp": ')[1][:-4]
 
-                    # Very last timeStamp entry does not end with "," which make the subscript invalid
+                    # Very last timestamp entry does not end with "," which make the subscript invalid
                     if eTimestamp.endswith('"') == False:
                         eTimestamp = eTimestamp + '"'
-                    target.write(twoIndent +'<data key="timeStamp">' + eTimestamp + '</data>\n')
+                    target.write(twoIndent +'<data key="timestamp">' + eTimestamp + '</data>\n')
 
                     # End of Edge
                     target.write(oneIndent + '</edge>\n')
@@ -117,4 +117,4 @@ def main():
 
 
 if __name__ == '__main__':
-    main()
+    main()

gsg.py

@@ -336,7 +336,7 @@ def WriteVertexInstanceToStream(vertexInstance, streamNum):
     streamFile.write('  {"vertex": {\n')
     streamFile.write('     "id": "' + str(vertexInstance.id) + '",\n')
     streamFile.write('     "attributes": ' + DictToJSONString(vertexInstance.attributes) + ',\n')
-    streamFile.write('     "timeStamp": "' + TimeStr(vertexInstance.streamCreationTimes[streamNum]) + '"}}')
+    streamFile.write('     "timestamp": "' + TimeStr(vertexInstance.streamCreationTimes[streamNum]) + '"}}')
 
 def WriteEdgeInstanceToStream(edgeInstance, streamNum):
     global gStreamFiles
@@ -352,7 +352,7 @@ def WriteEdgeInstanceToStream(edgeInstance, streamNum):
         streamFile.write('     "directed": "true",\n')
     else:
         streamFile.write('     "directed": "false",\n')
-    streamFile.write('     "timeStamp": "' + TimeStr(edgeInstance.creationTime) + '"}}')
+    streamFile.write('     "timestamp": "' + TimeStr(edgeInstance.creationTime) + '"}}')
 
 # Convert timeUnit to string according to output time format
 def TimeStr(timeUnit):
@@ -384,4 +384,4 @@ def main():
     CloseFiles()
 
 if __name__ == "__main__":
-    main()
+    main()