Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
073fe07
Merge pull request #24 from daviddesancho/develop
daviddesancho Sep 29, 2021
f99116f
traj: adds new discretizer class to incorporate features
daviddesancho May 3, 2022
911fa6f
Merge branch 'develop' of ssh://github.com/BioKT/MasterMSM into develop
daviddesancho May 3, 2022
ada1a36
test: puts tests in the right place
daviddesancho May 3, 2022
7367fc1
traj: reorders things as they are sensible
daviddesancho May 4, 2022
0ce874c
traj: dissappears the MultiTimeSeries class
daviddesancho May 4, 2022
0c0f11c
traj / test: consistently changes tests and trajectories
daviddesancho May 4, 2022
09b5e42
test: continues adding tests
daviddesancho May 4, 2022
4035c8d
traj: adds methods to discretize based on distances or ramachandran a…
daviddesancho May 4, 2022
eed4301
traj: fixes remaining cutoffs for torsions
daviddesancho May 5, 2022
58f4cb9
test: adds tests for torsions
daviddesancho May 5, 2022
f74dbb2
test: now downloading from osf
daviddesancho May 5, 2022
a7078a9
traj: torsions working properly
daviddesancho May 5, 2022
177c776
test: testing correctly
daviddesancho May 5, 2022
ad77ef0
test: dowload also ala5
daviddesancho May 5, 2022
3938679
traj: we dont need trajectory and timeseries objects
daviddesancho May 6, 2022
1bc5898
traj: adds dPCA and removes class
daviddesancho May 9, 2022
4a4c6bd
traj: restores buchete and hummer
daviddesancho May 9, 2022
a231252
test: restores tests for buchete hummer
daviddesancho May 9, 2022
bdc0a81
traj: features for one or more trajectories
daviddesancho Jul 20, 2022
5e98bcc
test: updates tests and 5 pass
daviddesancho Jul 20, 2022
8ea8e63
examples: updates examples
daviddesancho Jul 20, 2022
bfca0c7
traj: updates trajectory to make it work
daviddesancho Jul 20, 2022
737e480
test: updates trajectory tests
daviddesancho Jul 20, 2022
0c852b5
test: fixes download data
daviddesancho Jul 20, 2022
40c1b63
test: fixes tests in trajectory
daviddesancho Jul 20, 2022
d26b0aa
fixes spaces in shift
daviddesancho Jul 20, 2022
5edb535
test: all tests running for alaTB and ala5
daviddesancho Jul 20, 2022
c108459
examples: updates examples for alanine dipeptide
daviddesancho Jul 20, 2022
aaebe27
examples: adds example for ala5
daviddesancho Jul 20, 2022
6d6d3bc
test: includes test for DimRed and Discretizer
daviddesancho Jul 21, 2022
49bd374
traj: working PCA
daviddesancho Jul 21, 2022
71f968a
examples: updates examples
daviddesancho Jul 21, 2022
b1edcfa
traj: updates traj up to dimensionality reduction
daviddesancho Jul 21, 2022
9680603
traj: simplifies things a bit
daviddesancho Jul 21, 2022
f39c136
traj: dtrajs are now distrajs
daviddesancho Jul 21, 2022
62748a5
traj: removes all buchete-hummer functions and replaces them by hdbsc…
daviddesancho Jul 22, 2022
4c98ee4
examples: add hdbscan and kmeans examples
daviddesancho Jul 22, 2022
1243c19
examples: remove buchete hummer discretization
daviddesancho Jul 22, 2022
c8888ff
examples: removes legacy examples
daviddesancho Jul 22, 2022
95ab614
msm: updates counting
daviddesancho Jul 26, 2022
dbf9ffd
msm: updates reduce
daviddesancho Jul 26, 2022
97be79e
msm: simplifies names of functions
daviddesancho Jul 27, 2022
4157d38
traj: fixed issue with keys
daviddesancho Jul 27, 2022
9c73423
msm: simple msm works
daviddesancho Jul 27, 2022
cfbff70
msm: moving pieces from supermsm to msm
daviddesancho Jul 27, 2022
411b171
msm: polishes code
daviddesancho Jul 27, 2022
76a5741
msm: greatly simplifies functions
daviddesancho Jul 27, 2022
58cdb02
msm: gets rid for now of CK testing
daviddesancho Jul 27, 2022
8a8084e
test: updates testing
daviddesancho Jul 27, 2022
8c832bb
examples: includes lots of info for version 2 ala TB
daviddesancho Jul 27, 2022
acc846c
fix: resolve several bugs and modernize compatibility
daviddesancho Mar 13, 2026
0ec796c
ci: add GitHub Actions workflow for automated testing
daviddesancho Mar 13, 2026
ae7848f
fix: correct broken import in test_fewsm.py
daviddesancho Mar 13, 2026
01f83bd
docs: replace Travis CI badge with GitHub Actions, drop Codacy badge
daviddesancho Mar 13, 2026
102e1ed
fix: remaining np.float deprecations in msm_lib; add CI diagnostics
daviddesancho Mar 13, 2026
63c89cf
ci: output failing test details via junit XML on failure
daviddesancho Mar 13, 2026
fa6336c
ci: capture pytest output to file for failure inspection
daviddesancho Mar 13, 2026
15da1a1
ci: fix output capture to display pytest results in CI log
daviddesancho Mar 13, 2026
47d374d
ci: show full conda package list to diagnose Python 3.10 failure
daviddesancho Mar 13, 2026
47e72a8
fix: critical bugs, re-enable tests, update packaging
daviddesancho Jun 10, 2026
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
52 changes: 52 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: CI

on:
push:
branches: [master, develop]
pull_request:
branches: [master, develop]

jobs:
test:
name: Python ${{ matrix.python-version }} / ${{ matrix.os }}
runs-on: ${{ matrix.os }}

strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest]
python-version: ["3.10", "3.11", "3.12"]

defaults:
run:
shell: bash -l {0}

steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Set up conda (miniforge)
uses: conda-incubator/setup-miniconda@v3
with:
miniforge-version: latest
python-version: ${{ matrix.python-version }}
activate-environment: mastermsm-test
auto-activate-base: false

- name: Install dependencies
run: |
conda install -y -c conda-forge \
numpy scipy matplotlib networkx \
mdtraj scikit-learn
pip install pytest
pip install -e .

- name: Show package versions
run: conda list | grep -E "numpy|scipy|mdtraj|networkx|scikit"

- name: Run tests
run: |
pytest mastermsm/test/ -v --tb=long > pytest-output.txt 2>&1
RESULT=$?
cat pytest-output.txt
exit $RESULT
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[![Build Status](https://travis-ci.com/daviddesancho/MasterMSM.svg?branch=develop)](https://travis-ci.com/daviddesancho/MasterMSM)
[![CI](https://github.com/BioKT/MasterMSM/actions/workflows/ci.yml/badge.svg?branch=develop)](https://github.com/BioKT/MasterMSM/actions/workflows/ci.yml)
[![Documentation Status](https://readthedocs.org/projects/mastermsm/badge/?version=develop)](https://mastermsm.readthedocs.io/en/develop/?badge=develop)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/facdc755bf3c4c269f55738117db4c38)](https://www.codacy.com/app/daviddesancho/MasterMSM?utm_source=github.com&utm_medium=referral&utm_content=daviddesancho/MasterMSM&utm_campaign=Badge_Grade)

MasterMSM
=========
Expand Down
4 changes: 4 additions & 0 deletions TODO.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# MasterMSM

## develop branch
- [ ] Implement TICA
547 changes: 490 additions & 57 deletions examples/alanine_dipeptide/ala_dipeptide_discretize.ipynb

Large diffs are not rendered by default.

306 changes: 0 additions & 306 deletions examples/alanine_dipeptide/ala_dipeptide_dpca.ipynb

This file was deleted.

352 changes: 0 additions & 352 deletions examples/alanine_dipeptide/ala_dipeptide_multi.ipynb

This file was deleted.

275 changes: 0 additions & 275 deletions examples/alanine_pentapeptide/ala_pentapeptide_contacts.ipynb

This file was deleted.

294 changes: 0 additions & 294 deletions examples/alanine_pentapeptide/ala_pentapeptide_dpca.ipynb

This file was deleted.

980 changes: 980 additions & 0 deletions examples/alanine_pentapeptide/ala_pentapeptide_featurize.ipynb

Large diffs are not rendered by default.

Loading
Loading