Fix various regressions in CI, fix broken doc links (0f1180a4) · Commits · Utopia / utopia

.gitlab-ci.yml

+5 −1

Original line number	Diff line number	Diff line
		@@ -336,6 +336,10 @@ test:models:
		before_script:
		# Place a symlink at the expected path to make the model registry available
		- &add_cfg_symlink ln -s $CI_PROJECT_DIR/.config ~/.config && ls -la ~/
		#
		# Reduce number of steps for models to speed up CI
		- $ENTER_UTOPIA_ENV
		- utopia config user --set paramter_space.num_steps=10 --get
		script:
		# Test models using C++ and Python model tests
		- cd build
		@@ -354,7 +358,7 @@ test:models:

		# Now the actual models:
		- utopia run ContDisease --debug
		- utopia run Environment --debug -N 10
		- utopia run Environment --debug
		- utopia run ForestFire --debug
		- utopia run GameOfLife --debug
		- utopia run Geomorphology --debug

+1 −1

Original line number	Diff line number	Diff line
		@@ -103,7 +103,7 @@ Using the ``complete`` graph generator, you can generate a complete (fully-conne

		Erdős-Rényi random graphs
		**************************
		The ``random`` model creates a random graph using the Erdös-Rényi model, in which all links have an equal probability of occuring. If you set the ``parallel`` key to ``false``, no multi-edges are added. Utopia uses the ``boost::generate_random_graph`` `algorithm <https://github.com/boostorg/graph/blob/35d3e15a47c58e7e933a69354033ecb48bce75aa/include/boost/graph/random.hpp#L208>`_.
		The ``random`` model creates a random graph using the Erdös-Rényi model, in which all links have an equal probability of occuring. If you set the ``parallel`` key to ``false``, no multi-edges are added. Utopia uses the ``boost::generate_random_graph`` `algorithm <https://github.com/boostorg/graph/blob/master/include/boost/graph/random.hpp>`_.

		Small-world Watts-Strogatz graphs
		*********************************

+4 −2

Original line number	Diff line number	Diff line
		@@ -82,7 +82,9 @@ def times(dm: DataManager, , uni: UniverseGroup, *kwargs):
		times = uni["data/HdfBench/times"]

		# Use helper function for actual plot
		_plot_times(times=times, bench_names=times.coords["benchmark"], **kwargs)
		_plot_times(
		times=times, bench_names=times.coords["benchmark"].values, **kwargs
		)


		# -----------------------------------------------------------------------------
		@@ -124,7 +126,7 @@ def mean_times(
		_plot_times(
		times=times_mean,
		std=times_std,
		bench_names=times.coords["benchmark"],
		bench_names=times.coords["benchmark"].values,
		num_seeds=times["seed"].shape[0],
		**kwargs,
		)

+1 −1

Original line number	Diff line number	Diff line
		@@ -125,7 +125,7 @@ area_fraction:
		# Need to adjust scatter points such that they don't have an edge
		marker: '.'
		alpha: .8
		edgecolors: none
		edgecolor: none
		linewidths: 0.

		# Adjust helpers