Displaying differences for changeset
 
display as  

.oms/project.properties

@@ -11,7 +11,7 @@ oms.java.options=-Duser.language=en
 oms.loglevel=OFF
 
 # the oms runtime version tor be used
-oms.version=3.6.25
+oms.version=3.6.24
 
 # if enabled, no native annotation processing will be 
 # performed. 

simulation/rlz_psql/rlz_001.sim

@@ -4,74 +4,6 @@
  */
 import static oms3.SimBuilder.instance as OMS3
 
-#include "db.inc"
 def rlz = "001"
-def minCoordX = "632080.621"
-def maxCoordX = "648680.621"
-def minCoordY = "877368.297"
-def maxCoordY = "892818.297"
-def home = oms_prj
-OMS3.sim {
-
-    build()
-    
-
-    model(while: "c.cont") {
-        components {
-           "subpop"    "com.ficus.subset_tools.psql.tools.DiseaseCoordQuerySubset"
-           "dpd" "com.ficus.subset_tools.psql.tools.density.DiseasePopulationDensity"
-           "c" "fullSim.runSim"
-           "plot" "com.ficus.subset_tools.psql.utils.PlotMap"
-        }
-        
-        connect {
-            "subpop.peopleCount" "dpd.peopleCount"
-            "subpop.Xcoord" "dpd.xCoord"
-            "subpop.Ycoord" "dpd.yCoord"
-
-            "dpd.kdeResult"      "c.pop"
-
-            "c.printvar" "plot.vals"
-            "c.i"        "plot.i"
-            "c.maxTime"  "plot.maxTime"
-
-            "dpd.xMin" "plot.xMin"
-            "dpd.xMax" "plot.xMax"
-            "dpd.yMin" "plot.yMin"
-            "dpd.yMax" "plot.yMax"
-            "dpd.rlz"  "plot.rlz"
-            "dpd.cellSize"  "plot.cellSize"
-        }
-        
-        parameter {
-            "subpop.dbName"         "${dbname}"
-            "subpop.url"            "${url}"
-            "subpop.port"           "${port}"
-            "subpop.user"           "${user}"
-            "subpop.password"       "${password}"
-            "subpop.rlz"            "${rlz}"
-            "subpop.schema"            "mindinao"
-            "subpop.tableName"      "households"
-            "subpop.peopleColumn"   "PH2000A_PERN"
-            "subpop.enableSSL" "TRUE"
-            "subpop.sslcert"     "${home}/data/ssl-keys/postgresql.crt"
-            "subpop.sslkey"      "${home}/data/ssl-keys/postgresql.pk8"
-            "subpop.sslrootcert" "${home}/data/ssl-keys/root.crt"
-
-            "dpd.xMin" "${minCoordX}"
-            "dpd.xMax" "${maxCoordX}"
-            "dpd.yMin" "${minCoordY}"
-            "dpd.yMax" "${maxCoordY}"
-            "dpd.rlz"  "${rlz}"
-            "dpd.cellSize" 200
-            "dpd.bandwidth" 1
-
-            "plot.epsg"  "32651"
-
-            "c.maxTime" 2
-          
-            "plot.path" "output/"
-            "plot.name" "test"
-        }
-    }
-}
+#include "db.inc"
+#include "common.inc"

simulation/rlz_psql/rlz_002.sim

@@ -4,74 +4,6 @@
  */
 import static oms3.SimBuilder.instance as OMS3
 
-#include "db.inc"
 def rlz = "002"
-def minCoordX = "632080.621"
-def maxCoordX = "648680.621"
-def minCoordY = "877368.297"
-def maxCoordY = "892818.297"
-def home = oms_prj
-OMS3.sim {
-
-    build()
-    
-
-    model(while: "c.cont") {
-        components {
-           "subpop"    "com.ficus.subset_tools.psql.tools.DiseaseCoordQuerySubset"
-           "dpd" "com.ficus.subset_tools.psql.tools.density.DiseasePopulationDensity"
-           "c" "fullSim.runSim"
-           "plot" "com.ficus.subset_tools.psql.utils.PlotMap"
-        }
-        
-        connect {
-            "subpop.peopleCount" "dpd.peopleCount"
-            "subpop.Xcoord" "dpd.xCoord"
-            "subpop.Ycoord" "dpd.yCoord"
-
-            "dpd.kdeResult"      "c.pop"
-
-            "c.printvar" "plot.vals"
-            "c.i"        "plot.i"
-            "c.maxTime"  "plot.maxTime"
-
-            "dpd.xMin" "plot.xMin"
-            "dpd.xMax" "plot.xMax"
-            "dpd.yMin" "plot.yMin"
-            "dpd.yMax" "plot.yMax"
-            "dpd.rlz"  "plot.rlz"
-            "dpd.cellSize"  "plot.cellSize"
-        }
-        
-        parameter {
-            "subpop.dbName"         "${dbname}"
-            "subpop.url"            "${url}"
-            "subpop.port"           "${port}"
-            "subpop.user"           "${user}"
-            "subpop.password"       "${password}"
-            "subpop.rlz"            "${rlz}"
-            "subpop.schema"            "mindinao"
-            "subpop.tableName"      "households"
-            "subpop.peopleColumn"   "PH2000A_PERN"
-            "subpop.enableSSL" "TRUE"
-            "subpop.sslcert"     "${home}/data/ssl-keys/postgresql.crt"
-            "subpop.sslkey"      "${home}/data/ssl-keys/postgresql.pk8"
-            "subpop.sslrootcert" "${home}/data/ssl-keys/root.crt"
-
-            "dpd.xMin" "${minCoordX}"
-            "dpd.xMax" "${maxCoordX}"
-            "dpd.yMin" "${minCoordY}"
-            "dpd.yMax" "${maxCoordY}"
-            "dpd.rlz"  "${rlz}"
-            "dpd.cellSize" 200
-            "dpd.bandwidth" 1
-
-            "plot.epsg"  "32651"
-
-            "c.maxTime" 365
-          
-            "plot.path" "output/"
-            "plot.name" "test"
-        }
-    }
-}
+#include "db.inc"
+#include "common.inc"

simulation/rlz_psql/rlz_003.sim

@@ -4,74 +4,6 @@
  */
 import static oms3.SimBuilder.instance as OMS3
 
-#include "db.inc"
 def rlz = "003"
-def minCoordX = "632080.621"
-def maxCoordX = "648680.621"
-def minCoordY = "877368.297"
-def maxCoordY = "892818.297"
-def home = oms_prj
-OMS3.sim {
-
-    build()
-    
-
-    model(while: "c.cont") {
-        components {
-           "subpop"    "com.ficus.subset_tools.psql.tools.DiseaseCoordQuerySubset"
-           "dpd" "com.ficus.subset_tools.psql.tools.density.DiseasePopulationDensity"
-           "c" "fullSim.runSim"
-           "plot" "com.ficus.subset_tools.psql.utils.PlotMap"
-        }
-        
-        connect {
-            "subpop.peopleCount" "dpd.peopleCount"
-            "subpop.Xcoord" "dpd.xCoord"
-            "subpop.Ycoord" "dpd.yCoord"
-
-            "dpd.kdeResult"      "c.pop"
-
-            "c.printvar" "plot.vals"
-            "c.i"        "plot.i"
-            "c.maxTime"  "plot.maxTime"
-
-            "dpd.xMin" "plot.xMin"
-            "dpd.xMax" "plot.xMax"
-            "dpd.yMin" "plot.yMin"
-            "dpd.yMax" "plot.yMax"
-            "dpd.rlz"  "plot.rlz"
-            "dpd.cellSize"  "plot.cellSize"
-        }
-        
-        parameter {
-            "subpop.dbName"         "${dbname}"
-            "subpop.url"            "${url}"
-            "subpop.port"           "${port}"
-            "subpop.user"           "${user}"
-            "subpop.password"       "${password}"
-            "subpop.rlz"            "${rlz}"
-            "subpop.schema"            "mindinao"
-            "subpop.tableName"      "households"
-            "subpop.peopleColumn"   "PH2000A_PERN"
-            "subpop.enableSSL" "TRUE"
-            "subpop.sslcert"     "${home}/data/ssl-keys/postgresql.crt"
-            "subpop.sslkey"      "${home}/data/ssl-keys/postgresql.pk8"
-            "subpop.sslrootcert" "${home}/data/ssl-keys/root.crt"
-
-            "dpd.xMin" "${minCoordX}"
-            "dpd.xMax" "${maxCoordX}"
-            "dpd.yMin" "${minCoordY}"
-            "dpd.yMax" "${maxCoordY}"
-            "dpd.rlz"  "${rlz}"
-            "dpd.cellSize" 200
-            "dpd.bandwidth" 1
-
-            "plot.epsg"  "32651"
-
-            "c.maxTime" 365
-          
-            "plot.path" "output/"
-            "plot.name" "test"
-        }
-    }
-}
+#include "db.inc"
+#include "common.inc"

simulation/rlz_psql/rlz_004.sim

@@ -4,74 +4,6 @@
  */
 import static oms3.SimBuilder.instance as OMS3
 
-#include "db.inc"
 def rlz = "004"
-def minCoordX = "632080.621"
-def maxCoordX = "648680.621"
-def minCoordY = "877368.297"
-def maxCoordY = "892818.297"
-def home = oms_prj
-OMS3.sim {
-
-    build()
-    
-
-    model(while: "c.cont") {
-        components {
-           "subpop"    "com.ficus.subset_tools.psql.tools.DiseaseCoordQuerySubset"
-           "dpd" "com.ficus.subset_tools.psql.tools.density.DiseasePopulationDensity"
-           "c" "fullSim.runSim"
-           "plot" "com.ficus.subset_tools.psql.utils.PlotMap"
-        }
-        
-        connect {
-            "subpop.peopleCount" "dpd.peopleCount"
-            "subpop.Xcoord" "dpd.xCoord"
-            "subpop.Ycoord" "dpd.yCoord"
-
-            "dpd.kdeResult"      "c.pop"
-
-            "c.printvar" "plot.vals"
-            "c.i"        "plot.i"
-            "c.maxTime"  "plot.maxTime"
-
-            "dpd.xMin" "plot.xMin"
-            "dpd.xMax" "plot.xMax"
-            "dpd.yMin" "plot.yMin"
-            "dpd.yMax" "plot.yMax"
-            "dpd.rlz"  "plot.rlz"
-            "dpd.cellSize"  "plot.cellSize"
-        }
-        
-        parameter {
-            "subpop.dbName"         "${dbname}"
-            "subpop.url"            "${url}"
-            "subpop.port"           "${port}"
-            "subpop.user"           "${user}"
-            "subpop.password"       "${password}"
-            "subpop.rlz"            "${rlz}"
-            "subpop.schema"            "mindinao"
-            "subpop.tableName"      "households"
-            "subpop.peopleColumn"   "PH2000A_PERN"
-            "subpop.enableSSL" "TRUE"
-            "subpop.sslcert"     "${home}/data/ssl-keys/postgresql.crt"
-            "subpop.sslkey"      "${home}/data/ssl-keys/postgresql.pk8"
-            "subpop.sslrootcert" "${home}/data/ssl-keys/root.crt"
-
-            "dpd.xMin" "${minCoordX}"
-            "dpd.xMax" "${maxCoordX}"
-            "dpd.yMin" "${minCoordY}"
-            "dpd.yMax" "${maxCoordY}"
-            "dpd.rlz"  "${rlz}"
-            "dpd.cellSize" 200
-            "dpd.bandwidth" 1
-
-            "plot.epsg"  "32651"
-
-            "c.maxTime" 365
-          
-            "plot.path" "output/"
-            "plot.name" "test"
-        }
-    }
-}
+#include "db.inc"
+#include "common.inc"

simulation/rlz_psql/rlz_005.sim

@@ -4,74 +4,6 @@
  */
 import static oms3.SimBuilder.instance as OMS3
 
-#include "db.inc"
 def rlz = "005"
-def minCoordX = "632080.621"
-def maxCoordX = "648680.621"
-def minCoordY = "877368.297"
-def maxCoordY = "892818.297"
-def home = oms_prj
-OMS3.sim {
-
-    build()
-    
-
-    model(while: "c.cont") {
-        components {
-           "subpop"    "com.ficus.subset_tools.psql.tools.DiseaseCoordQuerySubset"
-           "dpd" "com.ficus.subset_tools.psql.tools.density.DiseasePopulationDensity"
-           "c" "fullSim.runSim"
-           "plot" "com.ficus.subset_tools.psql.utils.PlotMap"
-        }
-        
-        connect {
-            "subpop.peopleCount" "dpd.peopleCount"
-            "subpop.Xcoord" "dpd.xCoord"
-            "subpop.Ycoord" "dpd.yCoord"
-
-            "dpd.kdeResult"      "c.pop"
-
-            "c.printvar" "plot.vals"
-            "c.i"        "plot.i"
-            "c.maxTime"  "plot.maxTime"
-
-            "dpd.xMin" "plot.xMin"
-            "dpd.xMax" "plot.xMax"
-            "dpd.yMin" "plot.yMin"
-            "dpd.yMax" "plot.yMax"
-            "dpd.rlz"  "plot.rlz"
-            "dpd.cellSize"  "plot.cellSize"
-        }
-        
-        parameter {
-            "subpop.dbName"         "${dbname}"
-            "subpop.url"            "${url}"
-            "subpop.port"           "${port}"
-            "subpop.user"           "${user}"
-            "subpop.password"       "${password}"
-            "subpop.rlz"            "${rlz}"
-            "subpop.schema"            "mindinao"
-            "subpop.tableName"      "households"
-            "subpop.peopleColumn"   "PH2000A_PERN"
-            "subpop.enableSSL" "TRUE"
-            "subpop.sslcert"     "${home}/data/ssl-keys/postgresql.crt"
-            "subpop.sslkey"      "${home}/data/ssl-keys/postgresql.pk8"
-            "subpop.sslrootcert" "${home}/data/ssl-keys/root.crt"
-
-            "dpd.xMin" "${minCoordX}"
-            "dpd.xMax" "${maxCoordX}"
-            "dpd.yMin" "${minCoordY}"
-            "dpd.yMax" "${maxCoordY}"
-            "dpd.rlz"  "${rlz}"
-            "dpd.cellSize" 200
-            "dpd.bandwidth" 1
-
-            "plot.epsg"  "32651"
-
-            "c.maxTime" 365
-          
-            "plot.path" "output/"
-            "plot.name" "test"
-        }
-    }
-}
+#include "db.inc"
+#include "common.inc"

simulation/rlz_psql/rlz_006.sim

@@ -4,74 +4,6 @@
  */
 import static oms3.SimBuilder.instance as OMS3
 
-#include "db.inc"
 def rlz = "006"
-def minCoordX = "632080.621"
-def maxCoordX = "648680.621"
-def minCoordY = "877368.297"
-def maxCoordY = "892818.297"
-def home = oms_prj
-OMS3.sim {
-
-    build()
-    
-
-    model(while: "c.cont") {
-        components {
-           "subpop"    "com.ficus.subset_tools.psql.tools.DiseaseCoordQuerySubset"
-           "dpd" "com.ficus.subset_tools.psql.tools.density.DiseasePopulationDensity"
-           "c" "fullSim.runSim"
-           "plot" "com.ficus.subset_tools.psql.utils.PlotMap"
-        }
-        
-        connect {
-            "subpop.peopleCount" "dpd.peopleCount"
-            "subpop.Xcoord" "dpd.xCoord"
-            "subpop.Ycoord" "dpd.yCoord"
-
-            "dpd.kdeResult"      "c.pop"
-
-            "c.printvar" "plot.vals"
-            "c.i"        "plot.i"
-            "c.maxTime"  "plot.maxTime"
-
-            "dpd.xMin" "plot.xMin"
-            "dpd.xMax" "plot.xMax"
-            "dpd.yMin" "plot.yMin"
-            "dpd.yMax" "plot.yMax"
-            "dpd.rlz"  "plot.rlz"
-            "dpd.cellSize"  "plot.cellSize"
-        }
-        
-        parameter {
-            "subpop.dbName"         "${dbname}"
-            "subpop.url"            "${url}"
-            "subpop.port"           "${port}"
-            "subpop.user"           "${user}"
-            "subpop.password"       "${password}"
-            "subpop.rlz"            "${rlz}"
-            "subpop.schema"            "mindinao"
-            "subpop.tableName"      "households"
-            "subpop.peopleColumn"   "PH2000A_PERN"
-            "subpop.enableSSL" "TRUE"
-            "subpop.sslcert"     "${home}/data/ssl-keys/postgresql.crt"
-            "subpop.sslkey"      "${home}/data/ssl-keys/postgresql.pk8"
-            "subpop.sslrootcert" "${home}/data/ssl-keys/root.crt"
-
-            "dpd.xMin" "${minCoordX}"
-            "dpd.xMax" "${maxCoordX}"
-            "dpd.yMin" "${minCoordY}"
-            "dpd.yMax" "${maxCoordY}"
-            "dpd.rlz"  "${rlz}"
-            "dpd.cellSize" 200
-            "dpd.bandwidth" 1
-
-            "plot.epsg"  "32651"
-
-            "c.maxTime" 365
-          
-            "plot.path" "output/"
-            "plot.name" "test"
-        }
-    }
-}
+#include "db.inc"
+#include "common.inc"

simulation/rlz_psql/rlz_007.sim

@@ -4,74 +4,6 @@
  */
 import static oms3.SimBuilder.instance as OMS3
 
-#include "db.inc"
 def rlz = "007"
-def minCoordX = "632080.621"
-def maxCoordX = "648680.621"
-def minCoordY = "877368.297"
-def maxCoordY = "892818.297"
-def home = oms_prj
-OMS3.sim {
-
-    build()
-    
-
-    model(while: "c.cont") {
-        components {
-           "subpop"    "com.ficus.subset_tools.psql.tools.DiseaseCoordQuerySubset"
-           "dpd" "com.ficus.subset_tools.psql.tools.density.DiseasePopulationDensity"
-           "c" "fullSim.runSim"
-           "plot" "com.ficus.subset_tools.psql.utils.PlotMap"
-        }
-        
-        connect {
-            "subpop.peopleCount" "dpd.peopleCount"
-            "subpop.Xcoord" "dpd.xCoord"
-            "subpop.Ycoord" "dpd.yCoord"
-
-            "dpd.kdeResult"      "c.pop"
-
-            "c.printvar" "plot.vals"
-            "c.i"        "plot.i"
-            "c.maxTime"  "plot.maxTime"
-
-            "dpd.xMin" "plot.xMin"
-            "dpd.xMax" "plot.xMax"
-            "dpd.yMin" "plot.yMin"
-            "dpd.yMax" "plot.yMax"
-            "dpd.rlz"  "plot.rlz"
-            "dpd.cellSize"  "plot.cellSize"
-        }
-        
-        parameter {
-            "subpop.dbName"         "${dbname}"
-            "subpop.url"            "${url}"
-            "subpop.port"           "${port}"
-            "subpop.user"           "${user}"
-            "subpop.password"       "${password}"
-            "subpop.rlz"            "${rlz}"
-            "subpop.schema"            "mindinao"
-            "subpop.tableName"      "households"
-            "subpop.peopleColumn"   "PH2000A_PERN"
-            "subpop.enableSSL" "TRUE"
-            "subpop.sslcert"     "${home}/data/ssl-keys/postgresql.crt"
-            "subpop.sslkey"      "${home}/data/ssl-keys/postgresql.pk8"
-            "subpop.sslrootcert" "${home}/data/ssl-keys/root.crt"
-
-            "dpd.xMin" "${minCoordX}"
-            "dpd.xMax" "${maxCoordX}"
-            "dpd.yMin" "${minCoordY}"
-            "dpd.yMax" "${maxCoordY}"
-            "dpd.rlz"  "${rlz}"
-            "dpd.cellSize" 200
-            "dpd.bandwidth" 1
-
-            "plot.epsg"  "32651"
-
-            "c.maxTime" 365
-          
-            "plot.path" "output/"
-            "plot.name" "test"
-        }
-    }
-}
+#include "db.inc"
+#include "common.inc"

simulation/rlz_psql/rlz_008.sim

@@ -4,74 +4,6 @@
  */
 import static oms3.SimBuilder.instance as OMS3
 
-#include "db.inc"
 def rlz = "008"
-def minCoordX = "632080.621"
-def maxCoordX = "648680.621"
-def minCoordY = "877368.297"
-def maxCoordY = "892818.297"
-def home = oms_prj
-OMS3.sim {
-
-    build()
-    
-
-    model(while: "c.cont") {
-        components {
-           "subpop"    "com.ficus.subset_tools.psql.tools.DiseaseCoordQuerySubset"
-           "dpd" "com.ficus.subset_tools.psql.tools.density.DiseasePopulationDensity"
-           "c" "fullSim.runSim"
-           "plot" "com.ficus.subset_tools.psql.utils.PlotMap"
-        }
-        
-        connect {
-            "subpop.peopleCount" "dpd.peopleCount"
-            "subpop.Xcoord" "dpd.xCoord"
-            "subpop.Ycoord" "dpd.yCoord"
-
-            "dpd.kdeResult"      "c.pop"
-
-            "c.printvar" "plot.vals"
-            "c.i"        "plot.i"
-            "c.maxTime"  "plot.maxTime"
-
-            "dpd.xMin" "plot.xMin"
-            "dpd.xMax" "plot.xMax"
-            "dpd.yMin" "plot.yMin"
-            "dpd.yMax" "plot.yMax"
-            "dpd.rlz"  "plot.rlz"
-            "dpd.cellSize"  "plot.cellSize"
-        }
-        
-        parameter {
-            "subpop.dbName"         "${dbname}"
-            "subpop.url"            "${url}"
-            "subpop.port"           "${port}"
-            "subpop.user"           "${user}"
-            "subpop.password"       "${password}"
-            "subpop.rlz"            "${rlz}"
-            "subpop.schema"            "mindinao"
-            "subpop.tableName"      "households"
-            "subpop.peopleColumn"   "PH2000A_PERN"
-            "subpop.enableSSL" "TRUE"
-            "subpop.sslcert"     "${home}/data/ssl-keys/postgresql.crt"
-            "subpop.sslkey"      "${home}/data/ssl-keys/postgresql.pk8"
-            "subpop.sslrootcert" "${home}/data/ssl-keys/root.crt"
-
-            "dpd.xMin" "${minCoordX}"
-            "dpd.xMax" "${maxCoordX}"
-            "dpd.yMin" "${minCoordY}"
-            "dpd.yMax" "${maxCoordY}"
-            "dpd.rlz"  "${rlz}"
-            "dpd.cellSize" 200
-            "dpd.bandwidth" 1
-
-            "plot.epsg"  "32651"
-
-            "c.maxTime" 365
-          
-            "plot.path" "output/"
-            "plot.name" "test"
-        }
-    }
-}
+#include "db.inc"
+#include "common.inc"

simulation/rlz_psql/rlz_009.sim

@@ -4,74 +4,6 @@
  */
 import static oms3.SimBuilder.instance as OMS3
 
-#include "db.inc"
 def rlz = "009"
-def minCoordX = "632080.621"
-def maxCoordX = "648680.621"
-def minCoordY = "877368.297"
-def maxCoordY = "892818.297"
-def home = oms_prj
-OMS3.sim {
-
-    build()
-    
-
-    model(while: "c.cont") {
-        components {
-           "subpop"    "com.ficus.subset_tools.psql.tools.DiseaseCoordQuerySubset"
-           "dpd" "com.ficus.subset_tools.psql.tools.density.DiseasePopulationDensity"
-           "c" "fullSim.runSim"
-           "plot" "com.ficus.subset_tools.psql.utils.PlotMap"
-        }
-        
-        connect {
-            "subpop.peopleCount" "dpd.peopleCount"
-            "subpop.Xcoord" "dpd.xCoord"
-            "subpop.Ycoord" "dpd.yCoord"
-
-            "dpd.kdeResult"      "c.pop"
-
-            "c.printvar" "plot.vals"
-            "c.i"        "plot.i"
-            "c.maxTime"  "plot.maxTime"
-
-            "dpd.xMin" "plot.xMin"
-            "dpd.xMax" "plot.xMax"
-            "dpd.yMin" "plot.yMin"
-            "dpd.yMax" "plot.yMax"
-            "dpd.rlz"  "plot.rlz"
-            "dpd.cellSize"  "plot.cellSize"
-        }
-        
-        parameter {
-            "subpop.dbName"         "${dbname}"
-            "subpop.url"            "${url}"
-            "subpop.port"           "${port}"
-            "subpop.user"           "${user}"
-            "subpop.password"       "${password}"
-            "subpop.rlz"            "${rlz}"
-            "subpop.schema"            "mindinao"
-            "subpop.tableName"      "households"
-            "subpop.peopleColumn"   "PH2000A_PERN"
-            "subpop.enableSSL" "TRUE"
-            "subpop.sslcert"     "${home}/data/ssl-keys/postgresql.crt"
-            "subpop.sslkey"      "${home}/data/ssl-keys/postgresql.pk8"
-            "subpop.sslrootcert" "${home}/data/ssl-keys/root.crt"
-
-            "dpd.xMin" "${minCoordX}"
-            "dpd.xMax" "${maxCoordX}"
-            "dpd.yMin" "${minCoordY}"
-            "dpd.yMax" "${maxCoordY}"
-            "dpd.rlz"  "${rlz}"
-            "dpd.cellSize" 200
-            "dpd.bandwidth" 1
-
-            "plot.epsg"  "32651"
-
-            "c.maxTime" 365
-          
-            "plot.path" "output/"
-            "plot.name" "test"
-        }
-    }
-}
+#include "db.inc"
+#include "common.inc"

simulation/rlz_psql/rlz_010.sim

@@ -4,74 +4,6 @@
  */
 import static oms3.SimBuilder.instance as OMS3
 
-#include "db.inc"
 def rlz = "010"
-def minCoordX = "632080.621"
-def maxCoordX = "648680.621"
-def minCoordY = "877368.297"
-def maxCoordY = "892818.297"
-def home = oms_prj
-OMS3.sim {
-
-    build()
-    
-
-    model(while: "c.cont") {
-        components {
-           "subpop"    "com.ficus.subset_tools.psql.tools.DiseaseCoordQuerySubset"
-           "dpd" "com.ficus.subset_tools.psql.tools.density.DiseasePopulationDensity"
-           "c" "fullSim.runSim"
-           "plot" "com.ficus.subset_tools.psql.utils.PlotMap"
-        }
-        
-        connect {
-            "subpop.peopleCount" "dpd.peopleCount"
-            "subpop.Xcoord" "dpd.xCoord"
-            "subpop.Ycoord" "dpd.yCoord"
-
-            "dpd.kdeResult"      "c.pop"
-
-            "c.printvar" "plot.vals"
-            "c.i"        "plot.i"
-            "c.maxTime"  "plot.maxTime"
-
-            "dpd.xMin" "plot.xMin"
-            "dpd.xMax" "plot.xMax"
-            "dpd.yMin" "plot.yMin"
-            "dpd.yMax" "plot.yMax"
-            "dpd.rlz"  "plot.rlz"
-            "dpd.cellSize"  "plot.cellSize"
-        }
-        
-        parameter {
-            "subpop.dbName"         "${dbname}"
-            "subpop.url"            "${url}"
-            "subpop.port"           "${port}"
-            "subpop.user"           "${user}"
-            "subpop.password"       "${password}"
-            "subpop.rlz"            "${rlz}"
-            "subpop.schema"            "mindinao"
-            "subpop.tableName"      "households"
-            "subpop.peopleColumn"   "PH2000A_PERN"
-            "subpop.enableSSL" "TRUE"
-            "subpop.sslcert"     "${home}/data/ssl-keys/postgresql.crt"
-            "subpop.sslkey"      "${home}/data/ssl-keys/postgresql.pk8"
-            "subpop.sslrootcert" "${home}/data/ssl-keys/root.crt"
-
-            "dpd.xMin" "${minCoordX}"
-            "dpd.xMax" "${maxCoordX}"
-            "dpd.yMin" "${minCoordY}"
-            "dpd.yMax" "${maxCoordY}"
-            "dpd.rlz"  "${rlz}"
-            "dpd.cellSize" 200
-            "dpd.bandwidth" 1
-
-            "plot.epsg"  "32651"
-
-            "c.maxTime" 365
-          
-            "plot.path" "output/"
-            "plot.name" "test"
-        }
-    }
-}
+#include "db.inc"
+#include "common.inc"

simulation/rlz_psql/rlz_011.sim

@@ -4,74 +4,6 @@
  */
 import static oms3.SimBuilder.instance as OMS3
 
-#include "db.inc"
 def rlz = "011"
-def minCoordX = "632080.621"
-def maxCoordX = "648680.621"
-def minCoordY = "877368.297"
-def maxCoordY = "892818.297"
-def home = oms_prj
-OMS3.sim {
-
-    build()
-    
-
-    model(while: "c.cont") {
-        components {
-           "subpop"    "com.ficus.subset_tools.psql.tools.DiseaseCoordQuerySubset"
-           "dpd" "com.ficus.subset_tools.psql.tools.density.DiseasePopulationDensity"
-           "c" "fullSim.runSim"
-           "plot" "com.ficus.subset_tools.psql.utils.PlotMap"
-        }
-        
-        connect {
-            "subpop.peopleCount" "dpd.peopleCount"
-            "subpop.Xcoord" "dpd.xCoord"
-            "subpop.Ycoord" "dpd.yCoord"
-
-            "dpd.kdeResult"      "c.pop"
-
-            "c.printvar" "plot.vals"
-            "c.i"        "plot.i"
-            "c.maxTime"  "plot.maxTime"
-
-            "dpd.xMin" "plot.xMin"
-            "dpd.xMax" "plot.xMax"
-            "dpd.yMin" "plot.yMin"
-            "dpd.yMax" "plot.yMax"
-            "dpd.rlz"  "plot.rlz"
-            "dpd.cellSize"  "plot.cellSize"
-        }
-        
-        parameter {
-            "subpop.dbName"         "${dbname}"
-            "subpop.url"            "${url}"
-            "subpop.port"           "${port}"
-            "subpop.user"           "${user}"
-            "subpop.password"       "${password}"
-            "subpop.rlz"            "${rlz}"
-            "subpop.schema"            "mindinao"
-            "subpop.tableName"      "households"
-            "subpop.peopleColumn"   "PH2000A_PERN"
-            "subpop.enableSSL" "TRUE"
-            "subpop.sslcert"     "${home}/data/ssl-keys/postgresql.crt"
-            "subpop.sslkey"      "${home}/data/ssl-keys/postgresql.pk8"
-            "subpop.sslrootcert" "${home}/data/ssl-keys/root.crt"
-
-            "dpd.xMin" "${minCoordX}"
-            "dpd.xMax" "${maxCoordX}"
-            "dpd.yMin" "${minCoordY}"
-            "dpd.yMax" "${maxCoordY}"
-            "dpd.rlz"  "${rlz}"
-            "dpd.cellSize" 200
-            "dpd.bandwidth" 1
-
-            "plot.epsg"  "32651"
-
-            "c.maxTime" 365
-          
-            "plot.path" "output/"
-            "plot.name" "test"
-        }
-    }
-}
+#include "db.inc"
+#include "common.inc"

simulation/rlz_psql/rlz_012.sim

@@ -4,74 +4,6 @@
  */
 import static oms3.SimBuilder.instance as OMS3
 
-#include "db.inc"
 def rlz = "012"
-def minCoordX = "632080.621"
-def maxCoordX = "648680.621"
-def minCoordY = "877368.297"
-def maxCoordY = "892818.297"
-def home = oms_prj
-OMS3.sim {
-
-    build()
-    
-
-    model(while: "c.cont") {
-        components {
-           "subpop"    "com.ficus.subset_tools.psql.tools.DiseaseCoordQuerySubset"
-           "dpd" "com.ficus.subset_tools.psql.tools.density.DiseasePopulationDensity"
-           "c" "fullSim.runSim"
-           "plot" "com.ficus.subset_tools.psql.utils.PlotMap"
-        }
-        
-        connect {
-            "subpop.peopleCount" "dpd.peopleCount"
-            "subpop.Xcoord" "dpd.xCoord"
-            "subpop.Ycoord" "dpd.yCoord"
-
-            "dpd.kdeResult"      "c.pop"
-
-            "c.printvar" "plot.vals"
-            "c.i"        "plot.i"
-            "c.maxTime"  "plot.maxTime"
-
-            "dpd.xMin" "plot.xMin"
-            "dpd.xMax" "plot.xMax"
-            "dpd.yMin" "plot.yMin"
-            "dpd.yMax" "plot.yMax"
-            "dpd.rlz"  "plot.rlz"
-            "dpd.cellSize"  "plot.cellSize"
-        }
-        
-        parameter {
-            "subpop.dbName"         "${dbname}"
-            "subpop.url"            "${url}"
-            "subpop.port"           "${port}"
-            "subpop.user"           "${user}"
-            "subpop.password"       "${password}"
-            "subpop.rlz"            "${rlz}"
-            "subpop.schema"            "mindinao"
-            "subpop.tableName"      "households"
-            "subpop.peopleColumn"   "PH2000A_PERN"
-            "subpop.enableSSL" "TRUE"
-            "subpop.sslcert"     "${home}/data/ssl-keys/postgresql.crt"
-            "subpop.sslkey"      "${home}/data/ssl-keys/postgresql.pk8"
-            "subpop.sslrootcert" "${home}/data/ssl-keys/root.crt"
-
-            "dpd.xMin" "${minCoordX}"
-            "dpd.xMax" "${maxCoordX}"
-            "dpd.yMin" "${minCoordY}"
-            "dpd.yMax" "${maxCoordY}"
-            "dpd.rlz"  "${rlz}"
-            "dpd.cellSize" 200
-            "dpd.bandwidth" 1
-
-            "plot.epsg"  "32651"
-
-            "c.maxTime" 365
-          
-            "plot.path" "output/"
-            "plot.name" "test"
-        }
-    }
-}
+#include "db.inc"
+#include "common.inc"

simulation/rlz_psql/rlz_013.sim

@@ -4,74 +4,6 @@
  */
 import static oms3.SimBuilder.instance as OMS3
 
-#include "db.inc"
 def rlz = "013"
-def minCoordX = "632080.621"
-def maxCoordX = "648680.621"
-def minCoordY = "877368.297"
-def maxCoordY = "892818.297"
-def home = oms_prj
-OMS3.sim {
-
-    build()
-    
-
-    model(while: "c.cont") {
-        components {
-           "subpop"    "com.ficus.subset_tools.psql.tools.DiseaseCoordQuerySubset"
-           "dpd" "com.ficus.subset_tools.psql.tools.density.DiseasePopulationDensity"
-           "c" "fullSim.runSim"
-           "plot" "com.ficus.subset_tools.psql.utils.PlotMap"
-        }
-        
-        connect {
-            "subpop.peopleCount" "dpd.peopleCount"
-            "subpop.Xcoord" "dpd.xCoord"
-            "subpop.Ycoord" "dpd.yCoord"
-
-            "dpd.kdeResult"      "c.pop"
-
-            "c.printvar" "plot.vals"
-            "c.i"        "plot.i"
-            "c.maxTime"  "plot.maxTime"
-
-            "dpd.xMin" "plot.xMin"
-            "dpd.xMax" "plot.xMax"
-            "dpd.yMin" "plot.yMin"
-            "dpd.yMax" "plot.yMax"
-            "dpd.rlz"  "plot.rlz"
-            "dpd.cellSize"  "plot.cellSize"
-        }
-        
-        parameter {
-            "subpop.dbName"         "${dbname}"
-            "subpop.url"            "${url}"
-            "subpop.port"           "${port}"
-            "subpop.user"           "${user}"
-            "subpop.password"       "${password}"
-            "subpop.rlz"            "${rlz}"
-            "subpop.schema"            "mindinao"
-            "subpop.tableName"      "households"
-            "subpop.peopleColumn"   "PH2000A_PERN"
-            "subpop.enableSSL" "TRUE"
-            "subpop.sslcert"     "${home}/data/ssl-keys/postgresql.crt"
-            "subpop.sslkey"      "${home}/data/ssl-keys/postgresql.pk8"
-            "subpop.sslrootcert" "${home}/data/ssl-keys/root.crt"
-
-            "dpd.xMin" "${minCoordX}"
-            "dpd.xMax" "${maxCoordX}"
-            "dpd.yMin" "${minCoordY}"
-            "dpd.yMax" "${maxCoordY}"
-            "dpd.rlz"  "${rlz}"
-            "dpd.cellSize" 200
-            "dpd.bandwidth" 1
-
-            "plot.epsg"  "32651"
-
-            "c.maxTime" 365
-          
-            "plot.path" "output/"
-            "plot.name" "test"
-        }
-    }
-}
+#include "db.inc"
+#include "common.inc"

simulation/rlz_psql/rlz_014.sim

@@ -4,74 +4,6 @@
  */
 import static oms3.SimBuilder.instance as OMS3
 
-#include "db.inc"
 def rlz = "014"
-def minCoordX = "632080.621"
-def maxCoordX = "648680.621"
-def minCoordY = "877368.297"
-def maxCoordY = "892818.297"
-def home = oms_prj
-OMS3.sim {
-
-    build()
-    
-
-    model(while: "c.cont") {
-        components {
-           "subpop"    "com.ficus.subset_tools.psql.tools.DiseaseCoordQuerySubset"
-           "dpd" "com.ficus.subset_tools.psql.tools.density.DiseasePopulationDensity"
-           "c" "fullSim.runSim"
-           "plot" "com.ficus.subset_tools.psql.utils.PlotMap"
-        }
-        
-        connect {
-            "subpop.peopleCount" "dpd.peopleCount"
-            "subpop.Xcoord" "dpd.xCoord"
-            "subpop.Ycoord" "dpd.yCoord"
-
-            "dpd.kdeResult"      "c.pop"
-
-            "c.printvar" "plot.vals"
-            "c.i"        "plot.i"
-            "c.maxTime"  "plot.maxTime"
-
-            "dpd.xMin" "plot.xMin"
-            "dpd.xMax" "plot.xMax"
-            "dpd.yMin" "plot.yMin"
-            "dpd.yMax" "plot.yMax"
-            "dpd.rlz"  "plot.rlz"
-            "dpd.cellSize"  "plot.cellSize"
-        }
-        
-        parameter {
-            "subpop.dbName"         "${dbname}"
-            "subpop.url"            "${url}"
-            "subpop.port"           "${port}"
-            "subpop.user"           "${user}"
-            "subpop.password"       "${password}"
-            "subpop.rlz"            "${rlz}"
-            "subpop.schema"            "mindinao"
-            "subpop.tableName"      "households"
-            "subpop.peopleColumn"   "PH2000A_PERN"
-            "subpop.enableSSL" "TRUE"
-            "subpop.sslcert"     "${home}/data/ssl-keys/postgresql.crt"
-            "subpop.sslkey"      "${home}/data/ssl-keys/postgresql.pk8"
-            "subpop.sslrootcert" "${home}/data/ssl-keys/root.crt"
-
-            "dpd.xMin" "${minCoordX}"
-            "dpd.xMax" "${maxCoordX}"
-            "dpd.yMin" "${minCoordY}"
-            "dpd.yMax" "${maxCoordY}"
-            "dpd.rlz"  "${rlz}"
-            "dpd.cellSize" 200
-            "dpd.bandwidth" 1
-
-            "plot.epsg"  "32651"
-
-            "c.maxTime" 365
-          
-            "plot.path" "output/"
-            "plot.name" "test"
-        }
-    }
-}
+#include "db.inc"
+#include "common.inc"

simulation/rlz_psql/rlz_015.sim

@@ -4,74 +4,6 @@
  */
 import static oms3.SimBuilder.instance as OMS3
 
-#include "db.inc"
 def rlz = "015"
-def minCoordX = "632080.621"
-def maxCoordX = "648680.621"
-def minCoordY = "877368.297"
-def maxCoordY = "892818.297"
-def home = oms_prj
-OMS3.sim {
-
-    build()
-    
-
-    model(while: "c.cont") {
-        components {
-           "subpop"    "com.ficus.subset_tools.psql.tools.DiseaseCoordQuerySubset"
-           "dpd" "com.ficus.subset_tools.psql.tools.density.DiseasePopulationDensity"
-           "c" "fullSim.runSim"
-           "plot" "com.ficus.subset_tools.psql.utils.PlotMap"
-        }
-        
-        connect {
-            "subpop.peopleCount" "dpd.peopleCount"
-            "subpop.Xcoord" "dpd.xCoord"
-            "subpop.Ycoord" "dpd.yCoord"
-
-            "dpd.kdeResult"      "c.pop"
-
-            "c.printvar" "plot.vals"
-            "c.i"        "plot.i"
-            "c.maxTime"  "plot.maxTime"
-
-            "dpd.xMin" "plot.xMin"
-            "dpd.xMax" "plot.xMax"
-            "dpd.yMin" "plot.yMin"
-            "dpd.yMax" "plot.yMax"
-            "dpd.rlz"  "plot.rlz"
-            "dpd.cellSize"  "plot.cellSize"
-        }
-        
-        parameter {
-            "subpop.dbName"         "${dbname}"
-            "subpop.url"            "${url}"
-            "subpop.port"           "${port}"
-            "subpop.user"           "${user}"
-            "subpop.password"       "${password}"
-            "subpop.rlz"            "${rlz}"
-            "subpop.schema"            "mindinao"
-            "subpop.tableName"      "households"
-            "subpop.peopleColumn"   "PH2000A_PERN"
-            "subpop.enableSSL" "TRUE"
-            "subpop.sslcert"     "${home}/data/ssl-keys/postgresql.crt"
-            "subpop.sslkey"      "${home}/data/ssl-keys/postgresql.pk8"
-            "subpop.sslrootcert" "${home}/data/ssl-keys/root.crt"
-
-            "dpd.xMin" "${minCoordX}"
-            "dpd.xMax" "${maxCoordX}"
-            "dpd.yMin" "${minCoordY}"
-            "dpd.yMax" "${maxCoordY}"
-            "dpd.rlz"  "${rlz}"
-            "dpd.cellSize" 200
-            "dpd.bandwidth" 1
-
-            "plot.epsg"  "32651"
-
-            "c.maxTime" 365
-          
-            "plot.path" "output/"
-            "plot.name" "test"
-        }
-    }
-}
+#include "db.inc"
+#include "common.inc"

simulation/rlz_psql/rlz_016.sim

@@ -4,74 +4,6 @@
  */
 import static oms3.SimBuilder.instance as OMS3
 
-#include "db.inc"
 def rlz = "016"
-def minCoordX = "632080.621"
-def maxCoordX = "648680.621"
-def minCoordY = "877368.297"
-def maxCoordY = "892818.297"
-def home = oms_prj
-OMS3.sim {
-
-    build()
-    
-
-    model(while: "c.cont") {
-        components {
-           "subpop"    "com.ficus.subset_tools.psql.tools.DiseaseCoordQuerySubset"
-           "dpd" "com.ficus.subset_tools.psql.tools.density.DiseasePopulationDensity"
-           "c" "fullSim.runSim"
-           "plot" "com.ficus.subset_tools.psql.utils.PlotMap"
-        }
-        
-        connect {
-            "subpop.peopleCount" "dpd.peopleCount"
-            "subpop.Xcoord" "dpd.xCoord"
-            "subpop.Ycoord" "dpd.yCoord"
-
-            "dpd.kdeResult"      "c.pop"
-
-            "c.printvar" "plot.vals"
-            "c.i"        "plot.i"
-            "c.maxTime"  "plot.maxTime"
-
-            "dpd.xMin" "plot.xMin"
-            "dpd.xMax" "plot.xMax"
-            "dpd.yMin" "plot.yMin"
-            "dpd.yMax" "plot.yMax"
-            "dpd.rlz"  "plot.rlz"
-            "dpd.cellSize"  "plot.cellSize"
-        }
-        
-        parameter {
-            "subpop.dbName"         "${dbname}"
-            "subpop.url"            "${url}"
-            "subpop.port"           "${port}"
-            "subpop.user"           "${user}"
-            "subpop.password"       "${password}"
-            "subpop.rlz"            "${rlz}"
-            "subpop.schema"            "mindinao"
-            "subpop.tableName"      "households"
-            "subpop.peopleColumn"   "PH2000A_PERN"
-            "subpop.enableSSL" "TRUE"
-            "subpop.sslcert"     "${home}/data/ssl-keys/postgresql.crt"
-            "subpop.sslkey"      "${home}/data/ssl-keys/postgresql.pk8"
-            "subpop.sslrootcert" "${home}/data/ssl-keys/root.crt"
-
-            "dpd.xMin" "${minCoordX}"
-            "dpd.xMax" "${maxCoordX}"
-            "dpd.yMin" "${minCoordY}"
-            "dpd.yMax" "${maxCoordY}"
-            "dpd.rlz"  "${rlz}"
-            "dpd.cellSize" 200
-            "dpd.bandwidth" 1
-
-            "plot.epsg"  "32651"
-
-            "c.maxTime" 365
-          
-            "plot.path" "output/"
-            "plot.name" "test"
-        }
-    }
-}
+#include "db.inc"
+#include "common.inc"

simulation/rlz_psql/rlz_017.sim

@@ -4,74 +4,6 @@
  */
 import static oms3.SimBuilder.instance as OMS3
 
-#include "db.inc"
 def rlz = "017"
-def minCoordX = "632080.621"
-def maxCoordX = "648680.621"
-def minCoordY = "877368.297"
-def maxCoordY = "892818.297"
-def home = oms_prj
-OMS3.sim {
-
-    build()
-    
-
-    model(while: "c.cont") {
-        components {
-           "subpop"    "com.ficus.subset_tools.psql.tools.DiseaseCoordQuerySubset"
-           "dpd" "com.ficus.subset_tools.psql.tools.density.DiseasePopulationDensity"
-           "c" "fullSim.runSim"
-           "plot" "com.ficus.subset_tools.psql.utils.PlotMap"
-        }
-        
-        connect {
-            "subpop.peopleCount" "dpd.peopleCount"
-            "subpop.Xcoord" "dpd.xCoord"
-            "subpop.Ycoord" "dpd.yCoord"
-
-            "dpd.kdeResult"      "c.pop"
-
-            "c.printvar" "plot.vals"
-            "c.i"        "plot.i"
-            "c.maxTime"  "plot.maxTime"
-
-            "dpd.xMin" "plot.xMin"
-            "dpd.xMax" "plot.xMax"
-            "dpd.yMin" "plot.yMin"
-            "dpd.yMax" "plot.yMax"
-            "dpd.rlz"  "plot.rlz"
-            "dpd.cellSize"  "plot.cellSize"
-        }
-        
-        parameter {
-            "subpop.dbName"         "${dbname}"
-            "subpop.url"            "${url}"
-            "subpop.port"           "${port}"
-            "subpop.user"           "${user}"
-            "subpop.password"       "${password}"
-            "subpop.rlz"            "${rlz}"
-            "subpop.schema"            "mindinao"
-            "subpop.tableName"      "households"
-            "subpop.peopleColumn"   "PH2000A_PERN"
-            "subpop.enableSSL" "TRUE"
-            "subpop.sslcert"     "${home}/data/ssl-keys/postgresql.crt"
-            "subpop.sslkey"      "${home}/data/ssl-keys/postgresql.pk8"
-            "subpop.sslrootcert" "${home}/data/ssl-keys/root.crt"
-
-            "dpd.xMin" "${minCoordX}"
-            "dpd.xMax" "${maxCoordX}"
-            "dpd.yMin" "${minCoordY}"
-            "dpd.yMax" "${maxCoordY}"
-            "dpd.rlz"  "${rlz}"
-            "dpd.cellSize" 200
-            "dpd.bandwidth" 1
-
-            "plot.epsg"  "32651"
-
-            "c.maxTime" 365
-          
-            "plot.path" "output/"
-            "plot.name" "test"
-        }
-    }
-}
+#include "db.inc"
+#include "common.inc"

simulation/rlz_psql/rlz_018.sim

@@ -4,74 +4,6 @@
  */
 import static oms3.SimBuilder.instance as OMS3
 
-#include "db.inc"
 def rlz = "018"
-def minCoordX = "632080.621"
-def maxCoordX = "648680.621"
-def minCoordY = "877368.297"
-def maxCoordY = "892818.297"
-def home = oms_prj
-OMS3.sim {
-
-    build()
-    
-
-    model(while: "c.cont") {
-        components {
-           "subpop"    "com.ficus.subset_tools.psql.tools.DiseaseCoordQuerySubset"
-           "dpd" "com.ficus.subset_tools.psql.tools.density.DiseasePopulationDensity"
-           "c" "fullSim.runSim"
-           "plot" "com.ficus.subset_tools.psql.utils.PlotMap"
-        }
-        
-        connect {
-            "subpop.peopleCount" "dpd.peopleCount"
-            "subpop.Xcoord" "dpd.xCoord"
-            "subpop.Ycoord" "dpd.yCoord"
-
-            "dpd.kdeResult"      "c.pop"
-
-            "c.printvar" "plot.vals"
-            "c.i"        "plot.i"
-            "c.maxTime"  "plot.maxTime"
-
-            "dpd.xMin" "plot.xMin"
-            "dpd.xMax" "plot.xMax"
-            "dpd.yMin" "plot.yMin"
-            "dpd.yMax" "plot.yMax"
-            "dpd.rlz"  "plot.rlz"
-            "dpd.cellSize"  "plot.cellSize"
-        }
-        
-        parameter {
-            "subpop.dbName"         "${dbname}"
-            "subpop.url"            "${url}"
-            "subpop.port"           "${port}"
-            "subpop.user"           "${user}"
-            "subpop.password"       "${password}"
-            "subpop.rlz"            "${rlz}"
-            "subpop.schema"            "mindinao"
-            "subpop.tableName"      "households"
-            "subpop.peopleColumn"   "PH2000A_PERN"
-            "subpop.enableSSL" "TRUE"
-            "subpop.sslcert"     "${home}/data/ssl-keys/postgresql.crt"
-            "subpop.sslkey"      "${home}/data/ssl-keys/postgresql.pk8"
-            "subpop.sslrootcert" "${home}/data/ssl-keys/root.crt"
-
-            "dpd.xMin" "${minCoordX}"
-            "dpd.xMax" "${maxCoordX}"
-            "dpd.yMin" "${minCoordY}"
-            "dpd.yMax" "${maxCoordY}"
-            "dpd.rlz"  "${rlz}"
-            "dpd.cellSize" 200
-            "dpd.bandwidth" 1
-
-            "plot.epsg"  "32651"
-
-            "c.maxTime" 365
-          
-            "plot.path" "output/"
-            "plot.name" "test"
-        }
-    }
-}
+#include "db.inc"
+#include "common.inc"

simulation/rlz_psql/rlz_019.sim

@@ -4,74 +4,6 @@
  */
 import static oms3.SimBuilder.instance as OMS3
 
-#include "db.inc"
 def rlz = "019"
-def minCoordX = "632080.621"
-def maxCoordX = "648680.621"
-def minCoordY = "877368.297"
-def maxCoordY = "892818.297"
-def home = oms_prj
-OMS3.sim {
-
-    build()
-    
-
-    model(while: "c.cont") {
-        components {
-           "subpop"    "com.ficus.subset_tools.psql.tools.DiseaseCoordQuerySubset"
-           "dpd" "com.ficus.subset_tools.psql.tools.density.DiseasePopulationDensity"
-           "c" "fullSim.runSim"
-           "plot" "com.ficus.subset_tools.psql.utils.PlotMap"
-        }
-        
-        connect {
-            "subpop.peopleCount" "dpd.peopleCount"
-            "subpop.Xcoord" "dpd.xCoord"
-            "subpop.Ycoord" "dpd.yCoord"
-
-            "dpd.kdeResult"      "c.pop"
-
-            "c.printvar" "plot.vals"
-            "c.i"        "plot.i"
-            "c.maxTime"  "plot.maxTime"
-
-            "dpd.xMin" "plot.xMin"
-            "dpd.xMax" "plot.xMax"
-            "dpd.yMin" "plot.yMin"
-            "dpd.yMax" "plot.yMax"
-            "dpd.rlz"  "plot.rlz"
-            "dpd.cellSize"  "plot.cellSize"
-        }
-        
-        parameter {
-            "subpop.dbName"         "${dbname}"
-            "subpop.url"            "${url}"
-            "subpop.port"           "${port}"
-            "subpop.user"           "${user}"
-            "subpop.password"       "${password}"
-            "subpop.rlz"            "${rlz}"
-            "subpop.schema"            "mindinao"
-            "subpop.tableName"      "households"
-            "subpop.peopleColumn"   "PH2000A_PERN"
-            "subpop.enableSSL" "TRUE"
-            "subpop.sslcert"     "${home}/data/ssl-keys/postgresql.crt"
-            "subpop.sslkey"      "${home}/data/ssl-keys/postgresql.pk8"
-            "subpop.sslrootcert" "${home}/data/ssl-keys/root.crt"
-
-            "dpd.xMin" "${minCoordX}"
-            "dpd.xMax" "${maxCoordX}"
-            "dpd.yMin" "${minCoordY}"
-            "dpd.yMax" "${maxCoordY}"
-            "dpd.rlz"  "${rlz}"
-            "dpd.cellSize" 200
-            "dpd.bandwidth" 1
-
-            "plot.epsg"  "32651"
-
-            "c.maxTime" 365
-          
-            "plot.path" "output/"
-            "plot.name" "test"
-        }
-    }
-}
+#include "db.inc"
+#include "common.inc"

simulation/rlz_psql/rlz_020.sim

@@ -4,74 +4,6 @@
  */
 import static oms3.SimBuilder.instance as OMS3
 
-#include "db.inc"
 def rlz = "020"
-def minCoordX = "632080.621"
-def maxCoordX = "648680.621"
-def minCoordY = "877368.297"
-def maxCoordY = "892818.297"
-def home = oms_prj
-OMS3.sim {
-
-    build()
-    
-
-    model(while: "c.cont") {
-        components {
-           "subpop"    "com.ficus.subset_tools.psql.tools.DiseaseCoordQuerySubset"
-           "dpd" "com.ficus.subset_tools.psql.tools.density.DiseasePopulationDensity"
-           "c" "fullSim.runSim"
-           "plot" "com.ficus.subset_tools.psql.utils.PlotMap"
-        }
-        
-        connect {
-            "subpop.peopleCount" "dpd.peopleCount"
-            "subpop.Xcoord" "dpd.xCoord"
-            "subpop.Ycoord" "dpd.yCoord"
-
-            "dpd.kdeResult"      "c.pop"
-
-            "c.printvar" "plot.vals"
-            "c.i"        "plot.i"
-            "c.maxTime"  "plot.maxTime"
-
-            "dpd.xMin" "plot.xMin"
-            "dpd.xMax" "plot.xMax"
-            "dpd.yMin" "plot.yMin"
-            "dpd.yMax" "plot.yMax"
-            "dpd.rlz"  "plot.rlz"
-            "dpd.cellSize"  "plot.cellSize"
-        }
-        
-        parameter {
-            "subpop.dbName"         "${dbname}"
-            "subpop.url"            "${url}"
-            "subpop.port"           "${port}"
-            "subpop.user"           "${user}"
-            "subpop.password"       "${password}"
-            "subpop.rlz"            "${rlz}"
-            "subpop.schema"            "mindinao"
-            "subpop.tableName"      "households"
-            "subpop.peopleColumn"   "PH2000A_PERN"
-            "subpop.enableSSL" "TRUE"
-            "subpop.sslcert"     "${home}/data/ssl-keys/postgresql.crt"
-            "subpop.sslkey"      "${home}/data/ssl-keys/postgresql.pk8"
-            "subpop.sslrootcert" "${home}/data/ssl-keys/root.crt"
-
-            "dpd.xMin" "${minCoordX}"
-            "dpd.xMax" "${maxCoordX}"
-            "dpd.yMin" "${minCoordY}"
-            "dpd.yMax" "${maxCoordY}"
-            "dpd.rlz"  "${rlz}"
-            "dpd.cellSize" 200
-            "dpd.bandwidth" 1
-
-            "plot.epsg"  "32651"
-
-            "c.maxTime" 365
-          
-            "plot.path" "output/"
-            "plot.name" "test"
-        }
-    }
-}
+#include "db.inc"
+#include "common.inc"

simulation/rlz_psql/rlz_021.sim

@@ -4,74 +4,6 @@
  */
 import static oms3.SimBuilder.instance as OMS3
 
-#include "db.inc"
 def rlz = "021"
-def minCoordX = "632080.621"
-def maxCoordX = "648680.621"
-def minCoordY = "877368.297"
-def maxCoordY = "892818.297"
-def home = oms_prj
-OMS3.sim {
-
-    build()
-    
-
-    model(while: "c.cont") {
-        components {
-           "subpop"    "com.ficus.subset_tools.psql.tools.DiseaseCoordQuerySubset"
-           "dpd" "com.ficus.subset_tools.psql.tools.density.DiseasePopulationDensity"
-           "c" "fullSim.runSim"
-           "plot" "com.ficus.subset_tools.psql.utils.PlotMap"
-        }
-        
-        connect {
-            "subpop.peopleCount" "dpd.peopleCount"
-            "subpop.Xcoord" "dpd.xCoord"
-            "subpop.Ycoord" "dpd.yCoord"
-
-            "dpd.kdeResult"      "c.pop"
-
-            "c.printvar" "plot.vals"
-            "c.i"        "plot.i"
-            "c.maxTime"  "plot.maxTime"
-
-            "dpd.xMin" "plot.xMin"
-            "dpd.xMax" "plot.xMax"
-            "dpd.yMin" "plot.yMin"
-            "dpd.yMax" "plot.yMax"
-            "dpd.rlz"  "plot.rlz"
-            "dpd.cellSize"  "plot.cellSize"
-        }
-        
-        parameter {
-            "subpop.dbName"         "${dbname}"
-            "subpop.url"            "${url}"
-            "subpop.port"           "${port}"
-            "subpop.user"           "${user}"
-            "subpop.password"       "${password}"
-            "subpop.rlz"            "${rlz}"
-            "subpop.schema"            "mindinao"
-            "subpop.tableName"      "households"
-            "subpop.peopleColumn"   "PH2000A_PERN"
-            "subpop.enableSSL" "TRUE"
-            "subpop.sslcert"     "${home}/data/ssl-keys/postgresql.crt"
-            "subpop.sslkey"      "${home}/data/ssl-keys/postgresql.pk8"
-            "subpop.sslrootcert" "${home}/data/ssl-keys/root.crt"
-
-            "dpd.xMin" "${minCoordX}"
-            "dpd.xMax" "${maxCoordX}"
-            "dpd.yMin" "${minCoordY}"
-            "dpd.yMax" "${maxCoordY}"
-            "dpd.rlz"  "${rlz}"
-            "dpd.cellSize" 200
-            "dpd.bandwidth" 1
-
-            "plot.epsg"  "32651"
-
-            "c.maxTime" 365
-          
-            "plot.path" "output/"
-            "plot.name" "test"
-        }
-    }
-}
+#include "db.inc"
+#include "common.inc"

simulation/rlz_psql/rlz_022.sim

@@ -4,74 +4,6 @@
  */
 import static oms3.SimBuilder.instance as OMS3
 
-#include "db.inc"
 def rlz = "022"
-def minCoordX = "632080.621"
-def maxCoordX = "648680.621"
-def minCoordY = "877368.297"
-def maxCoordY = "892818.297"
-def home = oms_prj
-OMS3.sim {
-
-    build()
-    
-
-    model(while: "c.cont") {
-        components {
-           "subpop"    "com.ficus.subset_tools.psql.tools.DiseaseCoordQuerySubset"
-           "dpd" "com.ficus.subset_tools.psql.tools.density.DiseasePopulationDensity"
-           "c" "fullSim.runSim"
-           "plot" "com.ficus.subset_tools.psql.utils.PlotMap"
-        }
-        
-        connect {
-            "subpop.peopleCount" "dpd.peopleCount"
-            "subpop.Xcoord" "dpd.xCoord"
-            "subpop.Ycoord" "dpd.yCoord"
-
-            "dpd.kdeResult"      "c.pop"
-
-            "c.printvar" "plot.vals"
-            "c.i"        "plot.i"
-            "c.maxTime"  "plot.maxTime"
-
-            "dpd.xMin" "plot.xMin"
-            "dpd.xMax" "plot.xMax"
-            "dpd.yMin" "plot.yMin"
-            "dpd.yMax" "plot.yMax"
-            "dpd.rlz"  "plot.rlz"
-            "dpd.cellSize"  "plot.cellSize"
-        }
-        
-        parameter {
-            "subpop.dbName"         "${dbname}"
-            "subpop.url"            "${url}"
-            "subpop.port"           "${port}"
-            "subpop.user"           "${user}"
-            "subpop.password"       "${password}"
-            "subpop.rlz"            "${rlz}"
-            "subpop.schema"            "mindinao"
-            "subpop.tableName"      "households"
-            "subpop.peopleColumn"   "PH2000A_PERN"
-            "subpop.enableSSL" "TRUE"
-            "subpop.sslcert"     "${home}/data/ssl-keys/postgresql.crt"
-            "subpop.sslkey"      "${home}/data/ssl-keys/postgresql.pk8"
-            "subpop.sslrootcert" "${home}/data/ssl-keys/root.crt"
-
-            "dpd.xMin" "${minCoordX}"
-            "dpd.xMax" "${maxCoordX}"
-            "dpd.yMin" "${minCoordY}"
-            "dpd.yMax" "${maxCoordY}"
-            "dpd.rlz"  "${rlz}"
-            "dpd.cellSize" 200
-            "dpd.bandwidth" 1
-
-            "plot.epsg"  "32651"
-
-            "c.maxTime" 365
-          
-            "plot.path" "output/"
-            "plot.name" "test"
-        }
-    }
-}
+#include "db.inc"
+#include "common.inc"

simulation/rlz_psql/rlz_023.sim

@@ -4,74 +4,6 @@
  */
 import static oms3.SimBuilder.instance as OMS3
 
-#include "db.inc"
 def rlz = "023"
-def minCoordX = "632080.621"
-def maxCoordX = "648680.621"
-def minCoordY = "877368.297"
-def maxCoordY = "892818.297"
-def home = oms_prj
-OMS3.sim {
-
-    build()
-    
-
-    model(while: "c.cont") {
-        components {
-           "subpop"    "com.ficus.subset_tools.psql.tools.DiseaseCoordQuerySubset"
-           "dpd" "com.ficus.subset_tools.psql.tools.density.DiseasePopulationDensity"
-           "c" "fullSim.runSim"
-           "plot" "com.ficus.subset_tools.psql.utils.PlotMap"
-        }
-        
-        connect {
-            "subpop.peopleCount" "dpd.peopleCount"
-            "subpop.Xcoord" "dpd.xCoord"
-            "subpop.Ycoord" "dpd.yCoord"
-
-            "dpd.kdeResult"      "c.pop"
-
-            "c.printvar" "plot.vals"
-            "c.i"        "plot.i"
-            "c.maxTime"  "plot.maxTime"
-
-            "dpd.xMin" "plot.xMin"
-            "dpd.xMax" "plot.xMax"
-            "dpd.yMin" "plot.yMin"
-            "dpd.yMax" "plot.yMax"
-            "dpd.rlz"  "plot.rlz"
-            "dpd.cellSize"  "plot.cellSize"
-        }
-        
-        parameter {
-            "subpop.dbName"         "${dbname}"
-            "subpop.url"            "${url}"
-            "subpop.port"           "${port}"
-            "subpop.user"           "${user}"
-            "subpop.password"       "${password}"
-            "subpop.rlz"            "${rlz}"
-            "subpop.schema"            "mindinao"
-            "subpop.tableName"      "households"
-            "subpop.peopleColumn"   "PH2000A_PERN"
-            "subpop.enableSSL" "TRUE"
-            "subpop.sslcert"     "${home}/data/ssl-keys/postgresql.crt"
-            "subpop.sslkey"      "${home}/data/ssl-keys/postgresql.pk8"
-            "subpop.sslrootcert" "${home}/data/ssl-keys/root.crt"
-
-            "dpd.xMin" "${minCoordX}"
-            "dpd.xMax" "${maxCoordX}"
-            "dpd.yMin" "${minCoordY}"
-            "dpd.yMax" "${maxCoordY}"
-            "dpd.rlz"  "${rlz}"
-            "dpd.cellSize" 200
-            "dpd.bandwidth" 1
-
-            "plot.epsg"  "32651"
-
-            "c.maxTime" 365
-          
-            "plot.path" "output/"
-            "plot.name" "test"
-        }
-    }
-}
+#include "db.inc"
+#include "common.inc"

simulation/rlz_psql/rlz_024.sim

@@ -4,74 +4,6 @@
  */
 import static oms3.SimBuilder.instance as OMS3
 
-#include "db.inc"
 def rlz = "024"
-def minCoordX = "632080.621"
-def maxCoordX = "648680.621"
-def minCoordY = "877368.297"
-def maxCoordY = "892818.297"
-def home = oms_prj
-OMS3.sim {
-
-    build()
-    
-
-    model(while: "c.cont") {
-        components {
-           "subpop"    "com.ficus.subset_tools.psql.tools.DiseaseCoordQuerySubset"
-           "dpd" "com.ficus.subset_tools.psql.tools.density.DiseasePopulationDensity"
-           "c" "fullSim.runSim"
-           "plot" "com.ficus.subset_tools.psql.utils.PlotMap"
-        }
-        
-        connect {
-            "subpop.peopleCount" "dpd.peopleCount"
-            "subpop.Xcoord" "dpd.xCoord"
-            "subpop.Ycoord" "dpd.yCoord"
-
-            "dpd.kdeResult"      "c.pop"
-
-            "c.printvar" "plot.vals"
-            "c.i"        "plot.i"
-            "c.maxTime"  "plot.maxTime"
-
-            "dpd.xMin" "plot.xMin"
-            "dpd.xMax" "plot.xMax"
-            "dpd.yMin" "plot.yMin"
-            "dpd.yMax" "plot.yMax"
-            "dpd.rlz"  "plot.rlz"
-            "dpd.cellSize"  "plot.cellSize"
-        }
-        
-        parameter {
-            "subpop.dbName"         "${dbname}"
-            "subpop.url"            "${url}"
-            "subpop.port"           "${port}"
-            "subpop.user"           "${user}"
-            "subpop.password"       "${password}"
-            "subpop.rlz"            "${rlz}"
-            "subpop.schema"            "mindinao"
-            "subpop.tableName"      "households"
-            "subpop.peopleColumn"   "PH2000A_PERN"
-            "subpop.enableSSL" "TRUE"
-            "subpop.sslcert"     "${home}/data/ssl-keys/postgresql.crt"
-            "subpop.sslkey"      "${home}/data/ssl-keys/postgresql.pk8"
-            "subpop.sslrootcert" "${home}/data/ssl-keys/root.crt"
-
-            "dpd.xMin" "${minCoordX}"
-            "dpd.xMax" "${maxCoordX}"
-            "dpd.yMin" "${minCoordY}"
-            "dpd.yMax" "${maxCoordY}"
-            "dpd.rlz"  "${rlz}"
-            "dpd.cellSize" 200
-            "dpd.bandwidth" 1
-
-            "plot.epsg"  "32651"
-
-            "c.maxTime" 365
-          
-            "plot.path" "output/"
-            "plot.name" "test"
-        }
-    }
-}
+#include "db.inc"
+#include "common.inc"

simulation/rlz_psql/rlz_025.sim

@@ -4,74 +4,6 @@
  */
 import static oms3.SimBuilder.instance as OMS3
 
-#include "db.inc"
 def rlz = "025"
-def minCoordX = "632080.621"
-def maxCoordX = "648680.621"
-def minCoordY = "877368.297"
-def maxCoordY = "892818.297"
-def home = oms_prj
-OMS3.sim {
-
-    build()
-    
-
-    model(while: "c.cont") {
-        components {
-           "subpop"    "com.ficus.subset_tools.psql.tools.DiseaseCoordQuerySubset"
-           "dpd" "com.ficus.subset_tools.psql.tools.density.DiseasePopulationDensity"
-           "c" "fullSim.runSim"
-           "plot" "com.ficus.subset_tools.psql.utils.PlotMap"
-        }
-        
-        connect {
-            "subpop.peopleCount" "dpd.peopleCount"
-            "subpop.Xcoord" "dpd.xCoord"
-            "subpop.Ycoord" "dpd.yCoord"
-
-            "dpd.kdeResult"      "c.pop"
-
-            "c.printvar" "plot.vals"
-            "c.i"        "plot.i"
-            "c.maxTime"  "plot.maxTime"
-
-            "dpd.xMin" "plot.xMin"
-            "dpd.xMax" "plot.xMax"
-            "dpd.yMin" "plot.yMin"
-            "dpd.yMax" "plot.yMax"
-            "dpd.rlz"  "plot.rlz"
-            "dpd.cellSize"  "plot.cellSize"
-        }
-        
-        parameter {
-            "subpop.dbName"         "${dbname}"
-            "subpop.url"            "${url}"
-            "subpop.port"           "${port}"
-            "subpop.user"           "${user}"
-            "subpop.password"       "${password}"
-            "subpop.rlz"            "${rlz}"
-            "subpop.schema"            "mindinao"
-            "subpop.tableName"      "households"
-            "subpop.peopleColumn"   "PH2000A_PERN"
-            "subpop.enableSSL" "TRUE"
-            "subpop.sslcert"     "${home}/data/ssl-keys/postgresql.crt"
-            "subpop.sslkey"      "${home}/data/ssl-keys/postgresql.pk8"
-            "subpop.sslrootcert" "${home}/data/ssl-keys/root.crt"
-
-            "dpd.xMin" "${minCoordX}"
-            "dpd.xMax" "${maxCoordX}"
-            "dpd.yMin" "${minCoordY}"
-            "dpd.yMax" "${maxCoordY}"
-            "dpd.rlz"  "${rlz}"
-            "dpd.cellSize" 200
-            "dpd.bandwidth" 1
-
-            "plot.epsg"  "32651"
-
-            "c.maxTime" 365
-          
-            "plot.path" "output/"
-            "plot.name" "test"
-        }
-    }
-}
+#include "db.inc"
+#include "common.inc"

simulation/rlz_psql/rlz_026.sim

@@ -4,74 +4,6 @@
  */
 import static oms3.SimBuilder.instance as OMS3
 
-#include "db.inc"
 def rlz = "026"
-def minCoordX = "632080.621"
-def maxCoordX = "648680.621"
-def minCoordY = "877368.297"
-def maxCoordY = "892818.297"
-def home = oms_prj
-OMS3.sim {
-
-    build()
-    
-
-    model(while: "c.cont") {
-        components {
-           "subpop"    "com.ficus.subset_tools.psql.tools.DiseaseCoordQuerySubset"
-           "dpd" "com.ficus.subset_tools.psql.tools.density.DiseasePopulationDensity"
-           "c" "fullSim.runSim"
-           "plot" "com.ficus.subset_tools.psql.utils.PlotMap"
-        }
-        
-        connect {
-            "subpop.peopleCount" "dpd.peopleCount"
-            "subpop.Xcoord" "dpd.xCoord"
-            "subpop.Ycoord" "dpd.yCoord"
-
-            "dpd.kdeResult"      "c.pop"
-
-            "c.printvar" "plot.vals"
-            "c.i"        "plot.i"
-            "c.maxTime"  "plot.maxTime"
-
-            "dpd.xMin" "plot.xMin"
-            "dpd.xMax" "plot.xMax"
-            "dpd.yMin" "plot.yMin"
-            "dpd.yMax" "plot.yMax"
-            "dpd.rlz"  "plot.rlz"
-            "dpd.cellSize"  "plot.cellSize"
-        }
-        
-        parameter {
-            "subpop.dbName"         "${dbname}"
-            "subpop.url"            "${url}"
-            "subpop.port"           "${port}"
-            "subpop.user"           "${user}"
-            "subpop.password"       "${password}"
-            "subpop.rlz"            "${rlz}"
-            "subpop.schema"            "mindinao"
-            "subpop.tableName"      "households"
-            "subpop.peopleColumn"   "PH2000A_PERN"
-            "subpop.enableSSL" "TRUE"
-            "subpop.sslcert"     "${home}/data/ssl-keys/postgresql.crt"
-            "subpop.sslkey"      "${home}/data/ssl-keys/postgresql.pk8"
-            "subpop.sslrootcert" "${home}/data/ssl-keys/root.crt"
-
-            "dpd.xMin" "${minCoordX}"
-            "dpd.xMax" "${maxCoordX}"
-            "dpd.yMin" "${minCoordY}"
-            "dpd.yMax" "${maxCoordY}"
-            "dpd.rlz"  "${rlz}"
-            "dpd.cellSize" 200
-            "dpd.bandwidth" 1
-
-            "plot.epsg"  "32651"
-
-            "c.maxTime" 365
-          
-            "plot.path" "output/"
-            "plot.name" "test"
-        }
-    }
-}
+#include "db.inc"
+#include "common.inc"

simulation/rlz_psql/rlz_027.sim

@@ -4,74 +4,6 @@
  */
 import static oms3.SimBuilder.instance as OMS3
 
-#include "db.inc"
 def rlz = "027"
-def minCoordX = "632080.621"
-def maxCoordX = "648680.621"
-def minCoordY = "877368.297"
-def maxCoordY = "892818.297"
-def home = oms_prj
-OMS3.sim {
-
-    build()
-    
-
-    model(while: "c.cont") {
-        components {
-           "subpop"    "com.ficus.subset_tools.psql.tools.DiseaseCoordQuerySubset"
-           "dpd" "com.ficus.subset_tools.psql.tools.density.DiseasePopulationDensity"
-           "c" "fullSim.runSim"
-           "plot" "com.ficus.subset_tools.psql.utils.PlotMap"
-        }
-        
-        connect {
-            "subpop.peopleCount" "dpd.peopleCount"
-            "subpop.Xcoord" "dpd.xCoord"
-            "subpop.Ycoord" "dpd.yCoord"
-
-            "dpd.kdeResult"      "c.pop"
-
-            "c.printvar" "plot.vals"
-            "c.i"        "plot.i"
-            "c.maxTime"  "plot.maxTime"
-
-            "dpd.xMin" "plot.xMin"
-            "dpd.xMax" "plot.xMax"
-            "dpd.yMin" "plot.yMin"
-            "dpd.yMax" "plot.yMax"
-            "dpd.rlz"  "plot.rlz"
-            "dpd.cellSize"  "plot.cellSize"
-        }
-        
-        parameter {
-            "subpop.dbName"         "${dbname}"
-            "subpop.url"            "${url}"
-            "subpop.port"           "${port}"
-            "subpop.user"           "${user}"
-            "subpop.password"       "${password}"
-            "subpop.rlz"            "${rlz}"
-            "subpop.schema"            "mindinao"
-            "subpop.tableName"      "households"
-            "subpop.peopleColumn"   "PH2000A_PERN"
-            "subpop.enableSSL" "TRUE"
-            "subpop.sslcert"     "${home}/data/ssl-keys/postgresql.crt"
-            "subpop.sslkey"      "${home}/data/ssl-keys/postgresql.pk8"
-            "subpop.sslrootcert" "${home}/data/ssl-keys/root.crt"
-
-            "dpd.xMin" "${minCoordX}"
-            "dpd.xMax" "${maxCoordX}"
-            "dpd.yMin" "${minCoordY}"
-            "dpd.yMax" "${maxCoordY}"
-            "dpd.rlz"  "${rlz}"
-            "dpd.cellSize" 200
-            "dpd.bandwidth" 1
-
-            "plot.epsg"  "32651"
-
-            "c.maxTime" 365
-          
-            "plot.path" "output/"
-            "plot.name" "test"
-        }
-    }
-}
+#include "db.inc"
+#include "common.inc"

simulation/rlz_psql/rlz_028.sim

@@ -4,74 +4,6 @@
  */
 import static oms3.SimBuilder.instance as OMS3
 
-#include "db.inc"
 def rlz = "028"
-def minCoordX = "632080.621"
-def maxCoordX = "648680.621"
-def minCoordY = "877368.297"
-def maxCoordY = "892818.297"
-def home = oms_prj
-OMS3.sim {
-
-    build()
-    
-
-    model(while: "c.cont") {
-        components {
-           "subpop"    "com.ficus.subset_tools.psql.tools.DiseaseCoordQuerySubset"
-           "dpd" "com.ficus.subset_tools.psql.tools.density.DiseasePopulationDensity"
-           "c" "fullSim.runSim"
-           "plot" "com.ficus.subset_tools.psql.utils.PlotMap"
-        }
-        
-        connect {
-            "subpop.peopleCount" "dpd.peopleCount"
-            "subpop.Xcoord" "dpd.xCoord"
-            "subpop.Ycoord" "dpd.yCoord"
-
-            "dpd.kdeResult"      "c.pop"
-
-            "c.printvar" "plot.vals"
-            "c.i"        "plot.i"
-            "c.maxTime"  "plot.maxTime"
-
-            "dpd.xMin" "plot.xMin"
-            "dpd.xMax" "plot.xMax"
-            "dpd.yMin" "plot.yMin"
-            "dpd.yMax" "plot.yMax"
-            "dpd.rlz"  "plot.rlz"
-            "dpd.cellSize"  "plot.cellSize"
-        }
-        
-        parameter {
-            "subpop.dbName"         "${dbname}"
-            "subpop.url"            "${url}"
-            "subpop.port"           "${port}"
-            "subpop.user"           "${user}"
-            "subpop.password"       "${password}"
-            "subpop.rlz"            "${rlz}"
-            "subpop.schema"            "mindinao"
-            "subpop.tableName"      "households"
-            "subpop.peopleColumn"   "PH2000A_PERN"
-            "subpop.enableSSL" "TRUE"
-            "subpop.sslcert"     "${home}/data/ssl-keys/postgresql.crt"
-            "subpop.sslkey"      "${home}/data/ssl-keys/postgresql.pk8"
-            "subpop.sslrootcert" "${home}/data/ssl-keys/root.crt"
-
-            "dpd.xMin" "${minCoordX}"
-            "dpd.xMax" "${maxCoordX}"
-            "dpd.yMin" "${minCoordY}"
-            "dpd.yMax" "${maxCoordY}"
-            "dpd.rlz"  "${rlz}"
-            "dpd.cellSize" 200
-            "dpd.bandwidth" 1
-
-            "plot.epsg"  "32651"
-
-            "c.maxTime" 365
-          
-            "plot.path" "output/"
-            "plot.name" "test"
-        }
-    }
-}
+#include "db.inc"
+#include "common.inc"

simulation/rlz_psql/rlz_029.sim

@@ -4,74 +4,6 @@
  */
 import static oms3.SimBuilder.instance as OMS3
 
-#include "db.inc"
 def rlz = "029"
-def minCoordX = "632080.621"
-def maxCoordX = "648680.621"
-def minCoordY = "877368.297"
-def maxCoordY = "892818.297"
-def home = oms_prj
-OMS3.sim {
-
-    build()
-    
-
-    model(while: "c.cont") {
-        components {
-           "subpop"    "com.ficus.subset_tools.psql.tools.DiseaseCoordQuerySubset"
-           "dpd" "com.ficus.subset_tools.psql.tools.density.DiseasePopulationDensity"
-           "c" "fullSim.runSim"
-           "plot" "com.ficus.subset_tools.psql.utils.PlotMap"
-        }
-        
-        connect {
-            "subpop.peopleCount" "dpd.peopleCount"
-            "subpop.Xcoord" "dpd.xCoord"
-            "subpop.Ycoord" "dpd.yCoord"
-
-            "dpd.kdeResult"      "c.pop"
-
-            "c.printvar" "plot.vals"
-            "c.i"        "plot.i"
-            "c.maxTime"  "plot.maxTime"
-
-            "dpd.xMin" "plot.xMin"
-            "dpd.xMax" "plot.xMax"
-            "dpd.yMin" "plot.yMin"
-            "dpd.yMax" "plot.yMax"
-            "dpd.rlz"  "plot.rlz"
-            "dpd.cellSize"  "plot.cellSize"
-        }
-        
-        parameter {
-            "subpop.dbName"         "${dbname}"
-            "subpop.url"            "${url}"
-            "subpop.port"           "${port}"
-            "subpop.user"           "${user}"
-            "subpop.password"       "${password}"
-            "subpop.rlz"            "${rlz}"
-            "subpop.schema"            "mindinao"
-            "subpop.tableName"      "households"
-            "subpop.peopleColumn"   "PH2000A_PERN"
-            "subpop.enableSSL" "TRUE"
-            "subpop.sslcert"     "${home}/data/ssl-keys/postgresql.crt"
-            "subpop.sslkey"      "${home}/data/ssl-keys/postgresql.pk8"
-            "subpop.sslrootcert" "${home}/data/ssl-keys/root.crt"
-
-            "dpd.xMin" "${minCoordX}"
-            "dpd.xMax" "${maxCoordX}"
-            "dpd.yMin" "${minCoordY}"
-            "dpd.yMax" "${maxCoordY}"
-            "dpd.rlz"  "${rlz}"
-            "dpd.cellSize" 200
-            "dpd.bandwidth" 1
-
-            "plot.epsg"  "32651"
-
-            "c.maxTime" 365
-          
-            "plot.path" "output/"
-            "plot.name" "test"
-        }
-    }
-}
+#include "db.inc"
+#include "common.inc"

simulation/rlz_psql/rlz_030.sim

@@ -4,74 +4,6 @@
  */
 import static oms3.SimBuilder.instance as OMS3
 
-#include "db.inc"
 def rlz = "030"
-def minCoordX = "632080.621"
-def maxCoordX = "648680.621"
-def minCoordY = "877368.297"
-def maxCoordY = "892818.297"
-def home = oms_prj
-OMS3.sim {
-
-    build()
-    
-
-    model(while: "c.cont") {
-        components {
-           "subpop"    "com.ficus.subset_tools.psql.tools.DiseaseCoordQuerySubset"
-           "dpd" "com.ficus.subset_tools.psql.tools.density.DiseasePopulationDensity"
-           "c" "fullSim.runSim"
-           "plot" "com.ficus.subset_tools.psql.utils.PlotMap"
-        }
-        
-        connect {
-            "subpop.peopleCount" "dpd.peopleCount"
-            "subpop.Xcoord" "dpd.xCoord"
-            "subpop.Ycoord" "dpd.yCoord"
-
-            "dpd.kdeResult"      "c.pop"
-
-            "c.printvar" "plot.vals"
-            "c.i"        "plot.i"
-            "c.maxTime"  "plot.maxTime"
-
-            "dpd.xMin" "plot.xMin"
-            "dpd.xMax" "plot.xMax"
-            "dpd.yMin" "plot.yMin"
-            "dpd.yMax" "plot.yMax"
-            "dpd.rlz"  "plot.rlz"
-            "dpd.cellSize"  "plot.cellSize"
-        }
-        
-        parameter {
-            "subpop.dbName"         "${dbname}"
-            "subpop.url"            "${url}"
-            "subpop.port"           "${port}"
-            "subpop.user"           "${user}"
-            "subpop.password"       "${password}"
-            "subpop.rlz"            "${rlz}"
-            "subpop.schema"            "mindinao"
-            "subpop.tableName"      "households"
-            "subpop.peopleColumn"   "PH2000A_PERN"
-            "subpop.enableSSL" "TRUE"
-            "subpop.sslcert"     "${home}/data/ssl-keys/postgresql.crt"
-            "subpop.sslkey"      "${home}/data/ssl-keys/postgresql.pk8"
-            "subpop.sslrootcert" "${home}/data/ssl-keys/root.crt"
-
-            "dpd.xMin" "${minCoordX}"
-            "dpd.xMax" "${maxCoordX}"
-            "dpd.yMin" "${minCoordY}"
-            "dpd.yMax" "${maxCoordY}"
-            "dpd.rlz"  "${rlz}"
-            "dpd.cellSize" 200
-            "dpd.bandwidth" 1
-
-            "plot.epsg"  "32651"
-
-            "c.maxTime" 365
-          
-            "plot.path" "output/"
-            "plot.name" "test"
-        }
-    }
-}
+#include "db.inc"
+#include "common.inc"

simulation/rlz_psql/stat.sim

@@ -13,7 +13,7 @@ OMS3.sim {
 
         parameter {
             "plot.path"    "${home}/output/"
-            "plot.prefix"  ""
+            "plot.prefix"  "Disease"
         }
 
     }