Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated import, requirements #4

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 41 additions & 30 deletions Beetle Population Dynamics.ipynb

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion beetles_tda/features.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import giotto.diagrams as diag
import gtda.diagrams as diag
import numpy as np
import pandas as pd

Expand Down
8 changes: 4 additions & 4 deletions beetles_tda/generate_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
from sklearn.model_selection import train_test_split
from sklearn.cluster import KMeans
from sklearn.metrics.cluster import homogeneity_score
import giotto.time_series as ts
import giotto.homology as hl
from giotto.pipeline import Pipeline
import gtda.time_series as ts
import gtda.homology as hl
from gtda.pipeline import Pipeline
from beetles_tda.features import (
get_amplitude,
get_max_lifetime,
get_mean_lifetime,
get_n_rel_holes,
)
import giotto.diagrams as diag
import gtda.diagrams as diag
from fastprogress import master_bar, progress_bar


Expand Down
2 changes: 1 addition & 1 deletion beetles_tda/visualize.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import numpy as np
import plotly.graph_objs as gobj
from giotto.diagrams._utils import _subdiagrams
from gtda.diagrams._utils import _subdiagrams
import seaborn as sns
import matplotlib.pyplot as plt

Expand Down
9 changes: 5 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
giotto-learn==0.1.3
giotto-tda==0.1.4
jupyterlab==1.2.3
matplotlib==3.1.2
numpy==1.17.4
pandas==0.25.3
scikit-learn==0.21.3
cython==0.29.15
scikit-learn==0.22
seaborn==0.9.0
tqdm==4.40.0
plotly==4.3.0
plotly==4.4.1
fire==0.2.1
fastprogress==0.1.22
fastprogress==0.1.22