Minor fixed to documentation

gh-actions
Alinson S. Xavier 5 years ago
parent 9531279bb7
commit 243b835d78

@ -1,6 +1,11 @@
JULIA := julia --color=yes --project=@. JULIA := julia --color=yes --project=@.
SRC_FILES := $(wildcard src/*.jl test/*.jl) SRC_FILES := $(wildcard src/*.jl test/*.jl)
VERSION := 0.3
VERSION_MAJOR := 0
VERSION_MINOR := 3
VERSION_PATCH := 0
VERSION_SHORT := $(VERSION_MAJOR).$(VERSION_MINOR)
all: docs test all: docs test
@ -15,10 +20,7 @@ clean:
rm -rf build/* rm -rf build/*
docs: docs:
mkdocs build mkdocs build -d ../docs/$(VERSION_SHORT)/
docs-push:
rsync -avP docs/ isoron@axavier.org:/www/axavier.org/projects/RELOG/$(VERSION)/
test: build/test.log test: build/test.log

@ -11,11 +11,11 @@
* [Usage](usage.md) * [Usage](usage.md)
* [Input and Output Data Formats](format.md) * [Input and Output Data Formats](format.md)
* [Simplified Solution Reports](reports.md) * [Simplified Solution Reports](reports.md)
* [Optimization model](model.md) * [Optimization Model](model.md)
### Source Code ### Source Code
* [https://anl-ceeesa.github.io/RELOG/](https://anl-ceeesa.github.io/RELOG/) * [https://github.com/ANL-CEEESA/RELOG](https://github.com/ANL-CEEESA/RELOG)
### Authors ### Authors
* **Alinson S. Xavier,** Argonne National Laboratory <<axavier@anl.gov>> * **Alinson S. Xavier,** Argonne National Laboratory <<axavier@anl.gov>>

@ -106,7 +106,7 @@ In the third line, we have the disposal costs.
& \forall m \in M, p \in P, t \in T & \forall m \in M, p \in P, t \in T
\end{align} \end{align}
* A plant is operation at time $t$ if it was operational at time $t-1$ or it was built at time $t$. This constraint also prevents a plant from being built multiple times. * A plant is operational at time $t$ if it was operational at time $t-1$ or it was built at time $t$. This constraint also prevents a plant from being built multiple times.
\begin{align} \begin{align}
& x_{pt} = x_{p,t-1} + u_{pt} & x_{pt} = x_{p,t-1} + u_{pt}

@ -53,11 +53,12 @@ import geopandas as gp
# Plot base map # Plot base map
world = gp.read_file(gp.datasets.get_path('naturalearth_lowres')) world = gp.read_file(gp.datasets.get_path('naturalearth_lowres'))
world = world[world.continent == 'North America'] ax = world.plot(color='white', edgecolor='50', figsize=(13,6))
ax = world.plot(color='white', edgecolor='50', figsize=(15,15)) ax.set_ylim([23, 50])
ax.set_xlim([-128, -65])
# Plot plant locations # Plot plant locations
data = pd.read_csv("plants_report.csv") data = pd.read_csv("nimh_plants.csv")
points = gp.points_from_xy(data["longitude (deg)"], points = gp.points_from_xy(data["longitude (deg)"],
data["latitude (deg)"]) data["latitude (deg)"])
gp.GeoDataFrame(data, geometry=points).plot(ax=ax); gp.GeoDataFrame(data, geometry=points).plot(ax=ax);

Loading…
Cancel
Save