bugfix larch_genericstorage

jpn-- · Jan 7, 2015 · e47fc87 · e47fc87
1 parent a2c9bcf
commit e47fc87
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 9 deletions.
diff --git a/py/data_warehouse/MTCwork.elmdata → py/data_warehouse/MTCwork.sqlite b/py/data_warehouse/MTCwork.elmdata → py/data_warehouse/MTCwork.sqlite
diff --git a/py/data_warehouse/swissmetro.elmdata → py/data_warehouse/swissmetro.sqlite b/py/data_warehouse/swissmetro.elmdata → py/data_warehouse/swissmetro.sqlite
diff --git a/py/test/__init__.py b/py/test/__init__.py
@@ -52,15 +52,14 @@ def assertNearlyEqual(self, x, y, sigfigs=3):
 
 
 TEST_DATA = {
-  'MTC WORK MODE CHOICE':os.path.join(TEST_DIR,"MTCwork.elmdata"),
-  'MTCWORK-CSV':os.path.join(TEST_DIR,"MTC_WorkMode.csv"),
-  'MTCWORK-CSV-SHORT':os.path.join(TEST_DIR,"MTC_WorkMode_Short.csv"),
-  'TWIN CITY DEST CHOICE':os.path.join(TEST_DIR,"TwinCityQ.elmdata"),
-  'MSOM SIMULATION':os.path.join(TEST_DIR,"msom_sim.elmdata"),
-  'MICRODATA':os.path.join(TEST_DIR,"microdata.sql"),
-  'MICRODATA SQUEEZE':os.path.join(TEST_DIR,"microdata_squeeze.sql"),
-  'REFERENCE OUTPUT':os.path.join(TEST_DIR,"reference_output.txt"),
-  'OD SYNTH':os.path.join(TEST_DIR,"od_synth.elmd"),
+  'MTC WORK MODE CHOICE':os.path.join(TEST_DIR,"MTCwork.sqlite"),
+#  'MTCWORK-CSV':os.path.join(TEST_DIR,"MTC_WorkMode.csv"),
+#  'MTCWORK-CSV-SHORT':os.path.join(TEST_DIR,"MTC_WorkMode_Short.csv"),
+#  'TWIN CITY DEST CHOICE':os.path.join(TEST_DIR,"TwinCityQ.sqlite"),
+#  'MSOM SIMULATION':os.path.join(TEST_DIR,"msom_sim.elmdata"),
+#  'MICRODATA':os.path.join(TEST_DIR,"microdata.sql"),
+#  'MICRODATA SQUEEZE':os.path.join(TEST_DIR,"microdata_squeeze.sql"),
+#  'REFERENCE OUTPUT':os.path.join(TEST_DIR,"reference_output.txt"),
   'SWISSMETRO-CSV':os.path.join(TEST_DIR,"swissmetro.csv"),
   }
 

diff --git a/setup_common.py b/setup_common.py
@@ -0,0 +1,16 @@
+import os, sysconfig, sys
+
+
+def distutils_dir_name(dname):
+    """Returns the name of a distutils build directory"""
+    f = "{dirname}.{platform}-{version[0]}.{version[1]}"
+    return f.format(dirname=dname,
+                    platform=sysconfig.get_platform(),
+                    version=sys.version_info)
+
+def lib_folder():
+	return os.path.join('build', distutils_dir_name('lib'))
+
+def shlib_folder():
+	return os.path.join('build', distutils_dir_name('lib'), 'larch')
+