Added check for network data to be provided in request format instead of excel (6313afd7) · Commits · energyincities / pyehub

pyehub/multiple_hubs.py

+21 −14

Original line number	Diff line number	Diff line
		@@ -59,13 +59,17 @@ class NetworkModel(EHubModel):
		A subclass that allows connections between hubs.
		"""

		def __init__(self, *, excel=None, request=None, name=None, network=None, hub_id=None):
		def __init__(self, *, excel=None, request=None, name=None, network=None, network_request=None, hub_id=None):
		super().__init__(excel=excel, request=request)
		self.name = name
		self.hub_id = hub_id
		if excel:
		network_request = network_to_request_format.convert(network)

		if network_request:
		self._net_data = InputData(network_request)

		if self._net_data:
		self.links = self._net_data.links_ids
		self.link_capacities = ConstantOrVar(self.links, model=self, values=self._net_data.link_capacity)
		self.network_cost = RealVariable()
		@@ -76,6 +80,9 @@ class NetworkModel(EHubModel):
		self.FIXED_NETWORK_INVESTMENT_COST = self._net_data.fixed_network_investment_cost
		self.LINK_PROPORTIONAL_COST = self._net_data.link_proportional_cost

		else:
		raise RuntimeError("Can't create a network with no data.")

		def _add_variables(self):
		super()._add_variables()
		self._add_link_capacity_variables()
		@@ -152,8 +159,8 @@ class NetworkModelWithTotalCarbon(NetworkModel):

		MAX_CARBON = 0

		def __init__(self, *, excel=None, request=None, name=None, n=0, network=None, hub_id=None):
		super().__init__(excel=excel, request=request, name=name, network=network, hub_id=hub_id)
		def __init__(self, *, excel=None, request=None, name=None, n=0, network=None, network_request=None, hub_id=None):
		super().__init__(excel=excel, request=request, name=name, network=network, network_request=network_request, hub_id=hub_id)
		if n is not None:
		self.MAX_CARBON = n