Commit dc05e71a authored by Daniel Lehmberg's avatar Daniel Lehmberg
Browse files

Merge branch 'distance_refactor_and_partial_fit' into refactor_control_systems

# Conflicts:
#	.pre-commit-config.yaml
#	Makefile
#	datafold/appfold/edmd.py
#	datafold/appfold/tests/test_edmd.py
#	datafold/dynfold/__init__.py
#	datafold/dynfold/base.py
#	datafold/dynfold/compose.py
#	datafold/dynfold/dmap.py
#	datafold/dynfold/dmd.py
#	datafold/dynfold/jsf.py
#	datafold/dynfold/tests/test_dmap.py
#	datafold/dynfold/transform.py
#	datafold/pcfold/eigsolver.py
#	datafold/pcfold/kernels.py
#	datafold/pcfold/tests/test_kernels.py
#	datafold/pcfold/tests/test_tsc_collection.py
#	datafold/pcfold/timeseries/collection.py
#	doc/source/conf.py
#	doc/source/devapi.rst
#	doc/source/generate_tutorials_page.py
#	doc/source/index.rst
#	requirements-dev.txt
#	requirements.txt
#	tutorials/06_dmap_mahalanobis_kernel.ipynb
#	tutorials/README.rst
parents 0f5676b7 a86a00a8
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment