Eachan Johnson commited on
Commit
582802a
·
1 Parent(s): 9b95071

Pin working descriptastorus version

Browse files
Files changed (2) hide show
  1. pyproject.toml +1 -1
  2. schemist/features.py +3 -3
pyproject.toml CHANGED
@@ -30,7 +30,7 @@ classifiers = [
30
  dependencies = [
31
  "carabiner-tools[pd]>=0.0.3.post1",
32
  "datamol",
33
- "descriptastorus",
34
  "nemony",
35
  "openpyxl==3.1.0",
36
  "pandas",
 
30
  dependencies = [
31
  "carabiner-tools[pd]>=0.0.3.post1",
32
  "datamol",
33
+ "descriptastorus==2.6.1",
34
  "nemony",
35
  "openpyxl==3.1.0",
36
  "pandas",
schemist/features.py CHANGED
@@ -84,7 +84,7 @@ def calculate_2d_features(
84
  >>> features, validity = calculate_2d_features(strings=['CCC', 'CCCO'])
85
  >>> features[:,:3]
86
  array([[4.22879602e-01, 1.30009101e-04, 2.00014001e-05],
87
- [7.38891722e-01, 6.00042003e-04, 5.00035002e-05]])
88
  >>> validity
89
  array([1., 1.])
90
  >>> calculate_2d_features(strings=['CCC', 'CCCO'], return_dataframe=True).meta_feature_valid
@@ -191,12 +191,12 @@ def calculate_fingerprints(
191
  --------
192
  >>> bits, validity = calculate_fingerprints(strings='CCC')
193
  >>> bits
194
- ['80;294;1057;1344']
195
  >>> sum(validity) # doctest: +NORMALIZE_WHITESPACE
196
  1
197
  >>> bits, validity = calculate_fingerprints(strings=['CCC', 'CCCO'])
198
  >>> bits
199
- ['80;294;1057;1344', '80;222;294;473;794;807;1057;1277']
200
  >>> sum(validity) # doctest: +NORMALIZE_WHITESPACE
201
  2
202
  >>> np.sum(calculate_fingerprints(strings=['CCC', 'CCCO'], on_bits=False)[0], axis=-1)
 
84
  >>> features, validity = calculate_2d_features(strings=['CCC', 'CCCO'])
85
  >>> features[:,:3]
86
  array([[4.22879602e-01, 1.30009101e-04, 2.00014001e-05],
87
+ [7.38891722e-01, 6.00042003e-04, 5.00035002e-05]])
88
  >>> validity
89
  array([1., 1.])
90
  >>> calculate_2d_features(strings=['CCC', 'CCCO'], return_dataframe=True).meta_feature_valid
 
191
  --------
192
  >>> bits, validity = calculate_fingerprints(strings='CCC')
193
  >>> bits
194
+ array(['80;294;1057;1344'], dtype='<U16')
195
  >>> sum(validity) # doctest: +NORMALIZE_WHITESPACE
196
  1
197
  >>> bits, validity = calculate_fingerprints(strings=['CCC', 'CCCO'])
198
  >>> bits
199
+ array(['80;294;1057;1344', '80;222;294;473;794;807;1057;1277'], dtype='<U16')
200
  >>> sum(validity) # doctest: +NORMALIZE_WHITESPACE
201
  2
202
  >>> np.sum(calculate_fingerprints(strings=['CCC', 'CCCO'], on_bits=False)[0], axis=-1)