Merge branch 'develop'

fujaba · Nov 6, 2017 · 28f22db · 28f22db
2 parents cfc046b + c78bc79
commit 28f22db
Show file tree

Hide file tree

Showing 8 changed files with 2,260 additions and 1,971 deletions.
diff --git a/doc/FerrymansProblemExample.html b/doc/FerrymansProblemExample.html
diff --git a/doc/JsonPersistency.html b/doc/JsonPersistency.html
@@ -37,31 +37,31 @@
    {
       "session":"demo",
       "class":"org.sdmlib.test.examples.studyrightWithAssignments.model.University",
-      "id":"U1267772298593424",
-      "timestamp":"1267772298593424",
+      "id":"U2227783272168832",
+      "timestamp":"2227783272168832",
       "prop":{
          "name":"StudyRight",
          "students":[
             {
                "session":"demo",
                "class":"org.sdmlib.test.examples.studyrightWithAssignments.model.Student",
-               "id":"S1267772298780516",
-               "timestamp":"1267772298780516"
+               "id":"S2227783272355924",
+               "timestamp":"2227783272355924"
             }
          ]
       }
    },
    {
       "session":"demo",
       "class":"org.sdmlib.test.examples.studyrightWithAssignments.model.Student",
-      "id":"S1267772298780516",
-      "timestamp":"1267772298780516",
+      "id":"S2227783272355924",
+      "timestamp":"2227783272355924",
       "prop":{
          "name":"Karli",
          "id":"4242",
          "university":{
             "class":"org.sdmlib.test.examples.studyrightWithAssignments.model.University",
-            "id":"U1267772298593424"
+            "id":"U2227783272168832"
          }
       }
    }