Merge pull request #94 from switch-model/pypi_setup

rename switch_mod to switch_model; prepare switch_model package for upload to pypi.

.gitignore

@@ -3,4 +3,4 @@
 .idea
 .DS_Store
 gurobi.log
-SWITCH.egg-info/
+switch_model.egg-info/

README

@@ -1,4 +1,4 @@
-This contains the Switch electricity planning model written in Pyomo.
+This contains version 2 of the Switch electricity planning model.
 This optimization model is modular and can be used with varying levels
 of complexity. Look in the examples directory for demonstrations of
 using Switch for investment planning or production cost simulation. The

examples/3zone_toy/inputs/modules.txt

@@ -1,15 +1,15 @@
 # Core Modules
-switch_mod
-switch_mod.timescales
-switch_mod.financials
-switch_mod.balancing.load_zones
-switch_mod.energy_sources.properties
-switch_mod.generators.core.build
-switch_mod.generators.core.dispatch
-switch_mod.reporting
+switch_model
+switch_model.timescales
+switch_model.financials
+switch_model.balancing.load_zones
+switch_model.energy_sources.properties
+switch_model.generators.core.build
+switch_model.generators.core.dispatch
+switch_model.reporting
 # Custom Modules
-switch_mod.transmission.local_td
-switch_mod.generators.core.no_commit
-switch_mod.energy_sources.fuel_costs.markets
-switch_mod.transmission.transport.build
-switch_mod.transmission.transport.dispatch
+switch_model.transmission.local_td
+switch_model.generators.core.no_commit
+switch_model.energy_sources.fuel_costs.markets
+switch_model.transmission.transport.build
+switch_model.transmission.transport.dispatch

examples/3zone_toy/inputs/switch_inputs_version.txt

@@ -1 +1 @@
-2.0.0b1
+2.0.0b2

examples/3zone_toy_stochastic_PySP/PySPInputGenerator.py

@@ -65,14 +65,14 @@
 
 ###########################################################
 
-import switch_mod.utilities as utilities
-import switch_mod.solve
+import switch_model.utilities as utilities
+import switch_model.solve
 import sys, os
 from pyomo.environ import *
 
 print "creating model for scenario input generation..."
 
-module_list = switch_mod.solve.get_module_list(args=None)
+module_list = switch_model.solve.get_module_list(args=None)
 model = utilities.create_model(module_list)
 
 print "model successfully created..."

examples/3zone_toy_stochastic_PySP/ReferenceModel.py

@@ -26,19 +26,19 @@
 
 ###########################################################
 
-import switch_mod.utilities as utilities
-import switch_mod.financials as financials
-import switch_mod.solve
+import switch_model.utilities as utilities
+import switch_model.financials as financials
+import switch_model.solve
 import sys, os
 from pyomo.environ import *
 
 print "loading model..."
 
 # Ideally, we would use the main codebase to generate the model, but the
 # mandatory switch argument parser is interferring with pysp's command line tools
-#model = switch_mod.solve.main(return_model=True)
+#model = switch_model.solve.main(return_model=True)
 
-module_list = switch_mod.solve.get_module_list(args=None)
+module_list = switch_model.solve.get_module_list(args=None)
 model = utilities.create_model(module_list, args=[])
 
 # The following code augments the model object with Expressions for the 

examples/3zone_toy_stochastic_PySP/inputs/modules.txt

@@ -1,15 +1,15 @@
 # Core Modules
-switch_mod
-switch_mod.timescales
-switch_mod.financials
-switch_mod.balancing.load_zones
-switch_mod.energy_sources.properties
-switch_mod.generators.core.build
-switch_mod.generators.core.dispatch
-switch_mod.reporting
+switch_model
+switch_model.timescales
+switch_model.financials
+switch_model.balancing.load_zones
+switch_model.energy_sources.properties
+switch_model.generators.core.build
+switch_model.generators.core.dispatch
+switch_model.reporting
 # Custom Modules
-switch_mod.transmission.local_td
-switch_mod.generators.core.no_commit
-switch_mod.energy_sources.fuel_costs.simple
-switch_mod.transmission.transport.build
-switch_mod.transmission.transport.dispatch
+switch_model.transmission.local_td
+switch_model.generators.core.no_commit
+switch_model.energy_sources.fuel_costs.simple
+switch_model.transmission.transport.build
+switch_model.transmission.transport.dispatch

examples/3zone_toy_stochastic_PySP/inputs/switch_inputs_version.txt

@@ -1 +1 @@
-2.0.0b1
+2.0.0b2