Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
1be1b2d
start to SimStore support
dwhswenson Oct 23, 2020
e773c1f
fix tests
dwhswenson Oct 23, 2020
67c1b22
Tests for SimStore support
dwhswenson Nov 27, 2020
22ca390
monkey patching and snapshots for SimStore
dwhswenson Dec 6, 2020
132f23e
improve error message when missing objects
dwhswenson Dec 6, 2020
df83b71
Only monkeypatch SimStore once; better error msg
dwhswenson Dec 8, 2020
695ed8b
Add support for --table option in `contents`
dwhswenson Dec 8, 2020
f983f35
Steps toward allowing multiple --init_conds
dwhswenson Dec 8, 2020
fbe73da
Add md command
dwhswenson Dec 8, 2020
7948e37
OPSStorageLoadMultiple for INIT_CONDS
dwhswenson Dec 8, 2020
3229fba
Add test for getting multiple init conds
dwhswenson Dec 8, 2020
47e41af
Tests for --table arg to contents
dwhswenson Dec 8, 2020
98f3868
Add tests for md
dwhswenson Dec 9, 2020
830ef03
cleanup
dwhswenson Dec 9, 2020
6125554
tests for md command
dwhswenson Dec 9, 2020
00b83cc
more test coverage
dwhswenson Dec 9, 2020
dd4ec60
Some cleanup in contents; complete testing
dwhswenson Dec 9, 2020
586f1a7
docstrings
dwhswenson Dec 9, 2020
586e6e4
add test for tags table
dwhswenson Dec 9, 2020
8df4a54
Add progress reporting to md command
dwhswenson Dec 9, 2020
6531c49
Merge pull request #34 from dwhswenson/multiple-traj-init-conds
dwhswenson Dec 10, 2020
fb91628
Merge remote-tracking branch 'upstream/master' into md
dwhswenson Dec 10, 2020
10dcb1b
Merge pull request #33 from dwhswenson/content-table
dwhswenson Dec 11, 2020
38e01ba
Merge remote-tracking branch 'upstream/master' into md
dwhswenson Dec 11, 2020
bdace7f
Merge remote-tracking branch 'upstream/master' into simstore
dwhswenson Dec 11, 2020
7726d8c
Tell InterfaceSet to use SimStore when needed
dwhswenson Dec 11, 2020
8e9fa46
more tests; docstrings
dwhswenson Dec 15, 2020
29cd0d0
Merge pull request #35 from dwhswenson/md
dwhswenson Dec 17, 2020
3aa79ba
Merge remote-tracking branch 'upstream/master' into simstore
dwhswenson Dec 17, 2020
5650b49
Bump to 0.2.0.dev0; update autorelease
dwhswenson Dec 22, 2020
0aa3aa2
Merge pull request #36 from dwhswenson/bump-0.2.0.dev0
dwhswenson Dec 22, 2020
941e6ff
Merge remote-tracking branch 'upstream/master' into simstore
dwhswenson Dec 24, 2020
8695676
add reqs for SimStore
dwhswenson Dec 25, 2020
107f1db
Undo SimStore monkey patches after tests
dwhswenson Jan 1, 2021
17a0319
add a couple tests to complete coverage
dwhswenson Jan 1, 2021
40a503b
Merge pull request #29 from dwhswenson/simstore
dwhswenson Jan 1, 2021
3daed14
Release 0.2.0
dwhswenson Jan 1, 2021
aa58da0
use custom test-testpypi to add simstore reqs
dwhswenson Jan 1, 2021
b7b22e7
one-liner of test-testpypi
dwhswenson Jan 1, 2021
7fdf2cf
will && work?
dwhswenson Jan 1, 2021
3931c99
Fix bash variable
dwhswenson Jan 2, 2021
ecc32f2
Try updating autorelease vendoring
dwhswenson Jan 2, 2021
e36d201
don't forget to add the file!
dwhswenson Jan 2, 2021
a2a10aa
fix missing dots
dwhswenson Jan 2, 2021
b77dac4
install extras in autorelease install
dwhswenson Jan 4, 2021
3fb2f49
remove comment
dwhswenson Jan 4, 2021
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
Prev Previous commit
Next Next commit
monkey patching and snapshots for SimStore
  • Loading branch information
dwhswenson committed Dec 6, 2020
commit 22ca390d722c5670aa4bcbfae0ba434e62b33f9c
18 changes: 16 additions & 2 deletions paths_cli/param_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,10 @@ def _workaround(self, name):

def get(self, name):
if self._is_simstore(name):
import openpathsampling as paths
from openpathsampling.experimental.storage import \
monkey_patch_all
paths = monkey_patch_all(paths)
from openpathsampling.experimental.simstore import \
SQLStorageBackend
from openpathsampling.experimental.storage import Storage
Expand Down Expand Up @@ -217,10 +221,20 @@ class GetOnlySnapshot(Getter):
def __init__(self, store_name="snapshots"):
super().__init__(store_name)

def _min_num_snapshots(self, storage):
# For netcdfplus, we see 2 snapshots when there is only one
# (reversed copy gets saved). For SimStore, we see only one.
import openpathsampling as paths
if isinstance(storage, paths.netcdfplus.NetCDFPlus):
min_snaps = 2
else:
min_snaps = 1
return min_snaps

def __call__(self, storage):
store = getattr(storage, self.store_name)
if len(store) == 2:
# this is really only 1 snapshot; reversed copy gets saved
min_snaps = self._min_num_snapshots(storage)
if len(store) == min_snaps:
return store[0]


Expand Down