Commit 3b3362c4 authored by Bharath Ramsundar's avatar Bharath Ramsundar Committed by GitHub
Browse files

Merge pull request #597 from lilleswing/MIT-cleanup

License cleanup
parents 4a96d6d1 bb904c1a
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -235,11 +235,11 @@ def compute_all_ecfp(mol, indices=None, degree=2):


def compute_ecfp_features(mol, ecfp_degree, ecfp_power):
  """Computes ECFP features for provided openbabel molecule.
  """Computes ECFP features for provided rdkit molecule.

  Parameters:
  -----------
    system_ob: openbabel molecules
    mol: rdkit molecule
      Molecule to featurize.
    ecfp_degree: int
      ECFP radius
+5 −2
Original line number Diff line number Diff line
@@ -75,6 +75,8 @@ class TestReload(unittest.TestCase):

    # Fit trained model
    model.fit(dataset)
    scores_preload = model.evaluate(dataset,
                                    [classification_metric])['accuracy_score']
    model.save()

    # Load trained model
@@ -83,5 +85,6 @@ class TestReload(unittest.TestCase):
    reloaded_model.reload()

    # Eval model on train
    scores = reloaded_model.evaluate(dataset, [classification_metric])
    assert scores[classification_metric.name] > .6
    scores_reload = reloaded_model.evaluate(
        dataset, [classification_metric])['accuracy_score']
    assert np.isclose(scores_preload, scores_reload, 0.01)
+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ sphinx
scikit-learn
keras
theano ==0.7.2
openbabel
rdkit
pandas
numpy
+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ fi
export envname=$1
conda create -y --name $envname python=$python_version
source activate $envname
conda install -y -c omnia openbabel=2.4.0
conda install -y -c omnia pdbfixer=1.4
conda install -y -c rdkit rdkit
conda install -y joblib