Commit b43af8f1 authored by peastman's avatar peastman
Browse files

Merged changes from master branch

parents 38ff87d3 e4325ff5
Loading
Loading
Loading
Loading
+14 −9
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@ reference_lists = [
]

intervals = get_intervals(reference_lists)
possible_bond_stereo = ["STEREONONE", "STEREOANY", "STEREOZ", "STEREOE"]
bond_fdim_base = 6


def get_feature_list(atom):
@@ -210,8 +212,7 @@ def bond_features(bond, use_chirality=False):
  ]
  if use_chirality:
    bond_feats = bond_feats + one_of_k_encoding_unk(
        str(bond.GetStereo()),
        ["STEREONONE", "STEREOANY", "STEREOZ", "STEREOE"])
        str(bond.GetStereo()), possible_bond_stereo)
  return np.array(bond_feats)


@@ -396,6 +397,10 @@ class WeaveFeaturizer(Featurizer):
    self.explicit_H = explicit_H
    # If uses use_chirality
    self.use_chirality = use_chirality
    if self.use_chirality:
      self.bt_len = bond_fdim_base + len(possible_bond_stereo)
    else:
      self.bt_len = bond_fdim_base

  def _featurize(self, mol):
    """Encodes mol as a WeaveMol object."""
@@ -430,7 +435,7 @@ class WeaveFeaturizer(Featurizer):
        mol,
        edge_list,
        canon_adj_list,
        bt_len=6,
        bt_len=self.bt_len,
        graph_distance=self.graph_distance)

    return WeaveMol(nodes, pairs)
+2 −1
Original line number Diff line number Diff line
@@ -103,7 +103,8 @@ def in_silico_mutagenesis(model, X):
  Parameters
  ----------
  model: Model
    This can be any model that accepts inputs of the required shape.
    This can be any model that accepts inputs of the required shape and produces
    an output of shape (N_sequences, N_tasks).
  X: ndarray
    Shape (N_sequences, N_letters, sequence_length, 1)

+2 −1
Original line number Diff line number Diff line
@@ -852,6 +852,7 @@ class ScaffoldSplitter(Splitter):

  def split(self,
            dataset,
            seed=None,
            frac_train=.8,
            frac_valid=.1,
            frac_test=.1,
@@ -887,7 +888,7 @@ class ScaffoldSplitter(Splitter):
    log("About to generate scaffolds", self.verbose)
    for ind, smiles in enumerate(dataset.ids):
      if ind % log_every_n == 0:
        log(f"Generating scaffold {ind} {data_len}", self.verbose)
        log("Generating scaffold %d/%d" % (ind, data_len), self.verbose)
      scaffold = generate_scaffold(smiles)
      if scaffold not in scaffolds:
        scaffolds[scaffold] = [ind]
+0 −37647

File deleted.

Preview size limit exceeded, changes collapsed.

+0 −392

File deleted.

Preview size limit exceeded, changes collapsed.

Loading