Commit 0ebcdd5c authored by leswing's avatar leswing
Browse files

Merge branch 'jenkins' of github.com:lilleswing/deepchem into jenkins

parents bca8b547 93cb42fb
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -221,8 +221,8 @@ Random splitting

|Dataset    |Model               |Train score/ROC-AUC|Valid score/ROC-AUC|
|-----------|--------------------|-------------------|-------------------|
|tox21      |logistic regression |0.903              |0.735              |
|           |Multitask network   |0.856              |0.783              |
|tox21      |logistic regression |0.902              |0.715              |
|           |Multitask network   |0.844              |0.795              |
|           |robust MT-NN        |0.855              |0.773              |
|           |graph convolution   |0.865              |0.827              |
|muv        |logistic regression |0.957              |0.719              |
+2 −1
Original line number Diff line number Diff line
@@ -388,8 +388,9 @@ class ScaffoldSplitter(Splitter):
      else:
        scaffolds[scaffold].append(ind)
    # Sort from largest to smallest scaffold sets
    scaffolds = {key: sorted(value) for key, value in scaffolds.items()}
    scaffold_sets = [scaffold_set for (scaffold, scaffold_set) in
                     sorted(scaffolds.items(), key=lambda x: -len(x[1]))]
                     sorted(scaffolds.items(), key=lambda x: (len(x[1]), x[1][0]), reverse=True)]
    train_cutoff = frac_train * len(dataset)
    valid_cutoff = (frac_train + frac_valid) * len(dataset)
    train_inds, valid_inds, test_inds = [], [], []
+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ Index splitting,clintox,logistic regression,0.967,0.676
Index splitting,clintox,Multitask network,0.934,0.830
Index splitting,clintox,robust MT-NN,0.949,0.827
Index splitting,clintox,graph convolution,0.946,0.860
Random splitting,tox21,logistic regression,0.903,0.735
Random splitting,tox21,Multitask network,0.856,0.783
Random splitting,tox21,logistic regression,0.902,0.715
Random splitting,tox21,Multitask network,0.844,0.795
Random splitting,tox21,robust MT-NN,0.855,0.773
Random splitting,tox21,graph convolution,0.865,0.827
Random splitting,muv,logistic regression,0.957,0.719
+1 −1
Original line number Diff line number Diff line
@@ -23,4 +23,4 @@ nosetests -v devtools/jenkins/compare_results.py --with-xunit || true

source deactivate
conda remove --name $envname --all
rm results.csv
 No newline at end of file
rm examples/results.csv