Skip to content

Commit

Permalink
rename package to VOID
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel Schwalbe-Koda committed Aug 18, 2020
1 parent 596aaa2 commit 390e0e3
Show file tree
Hide file tree
Showing 65 changed files with 69 additions and 69 deletions.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions moldocker/dockers/base.py → VOID/dockers/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
from typing import List
from pymatgen.core import Structure, Molecule

from moldocker.structure import Complex
from moldocker.object import ParseableObject
from VOID.structure import Complex
from VOID.object import ParseableObject


ATTEMPTS = 50
Expand Down
4 changes: 2 additions & 2 deletions moldocker/dockers/batch.py → VOID/dockers/batch.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import numpy as np

from .base import Docker
from moldocker.structure import Complex
from moldocker.utils.geometry import random_rotation_matrices
from VOID.structure import Complex
from VOID.utils.geometry import random_rotation_matrices


class BatchDocker(Docker):
Expand Down
6 changes: 3 additions & 3 deletions moldocker/dockers/mcdocker.py → VOID/dockers/mcdocker.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import numpy as np

from moldocker.structure import Complex
from moldocker.mcarlo import Metropolis, Action
from moldocker.dockers import Docker
from VOID.structure import Complex
from VOID.mcarlo import Metropolis, Action
from VOID.dockers import Docker


class MonteCarloDocker(Metropolis, Docker):
Expand Down
4 changes: 2 additions & 2 deletions moldocker/dockers/serial.py → VOID/dockers/serial.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import numpy as np

from .base import Docker
from moldocker.structure import Complex
from moldocker.utils.geometry import random_rotation_matrices
from VOID.structure import Complex
from VOID.utils.geometry import random_rotation_matrices


class SerialDocker(Docker):
Expand Down
2 changes: 1 addition & 1 deletion moldocker/dockers/subdock.py → VOID/dockers/subdock.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import numpy as np

from moldocker.object import ParseableObject
from VOID.object import ParseableObject


MAX_SUBDOCK = 1
Expand Down
6 changes: 3 additions & 3 deletions moldocker/dockers/success.py → VOID/dockers/success.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import numpy as np

from moldocker.structure import Complex
from moldocker.dockers.serial import SerialDocker
from moldocker.dockers.mcdocker import MonteCarloDocker
from VOID.structure import Complex
from VOID.dockers.serial import SerialDocker
from VOID.dockers.mcdocker import MonteCarloDocker


class SuccessDocker(SerialDocker):
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import numpy as np
import unittest as ut

from moldocker.dockers import BatchDocker
from moldocker.samplers import OriginSampler
from moldocker.fitness import MinDistanceFitness
from VOID.dockers import BatchDocker
from VOID.samplers import OriginSampler
from VOID.fitness import MinDistanceFitness

from moldocker.tests.test_inputs import load_structure, load_molecule
from VOID.tests.test_inputs import load_structure, load_molecule


class TestBatch(ut.TestCase):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import numpy as np
import unittest as ut

from moldocker.dockers import Docker
from moldocker.samplers import OriginSampler
from VOID.dockers import Docker
from VOID.samplers import OriginSampler

from moldocker.tests.test_inputs import load_structure, load_molecule
from VOID.tests.test_inputs import load_structure, load_molecule


@ut.skip("does not execute this class")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import numpy as np
import unittest as ut

from moldocker.structure import Complex
from moldocker.dockers import MonteCarloDocker
from moldocker.samplers import OriginSampler
from moldocker.fitness import MinDistanceFitness
from VOID.structure import Complex
from VOID.dockers import MonteCarloDocker
from VOID.samplers import OriginSampler
from VOID.fitness import MinDistanceFitness

from moldocker.tests.test_inputs import load_structure, load_molecule
from VOID.tests.test_inputs import load_structure, load_molecule


class TestMCDocker(ut.TestCase):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import numpy as np
import unittest as ut

from moldocker.structure import Complex
from moldocker.dockers import BatchDocker, Subdocker
from moldocker.samplers import OriginSampler
from moldocker.fitness import MinDistanceFitness
from VOID.structure import Complex
from VOID.dockers import BatchDocker, Subdocker
from VOID.samplers import OriginSampler
from VOID.fitness import MinDistanceFitness

from moldocker.tests.test_inputs import load_structure, load_molecule
from VOID.tests.test_inputs import load_structure, load_molecule


class TestSubdocker(ut.TestCase):
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion moldocker/fitness/base.py → VOID/fitness/base.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from moldocker.object import ParseableObject
from VOID.object import ParseableObject


class Fitness(ParseableObject):
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions moldocker/io/tests/test_cif.py → VOID/io/tests/test_cif.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
import shutil
import unittest as ut

from moldocker.io import cif
from moldocker.tests.test_inputs import load_structure, load_molecule, inpath
from VOID.io import cif
from VOID.tests.test_inputs import load_structure, load_molecule, inpath


class TestCif(ut.TestCase):
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion moldocker/mcarlo/base.py → VOID/mcarlo/base.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from moldocker.object import ParseableObject
from VOID.object import ParseableObject


NUM_STEPS = 50
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import numpy as np
import unittest as ut

from moldocker.mcarlo import MarkovChainMC, Action
from moldocker.fitness import Fitness
from VOID.mcarlo import MarkovChainMC, Action
from VOID.fitness import Fitness


class ExampleMCMC(MarkovChainMC):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy as np
import unittest as ut

from moldocker.mcarlo import Metropolis, Action
from VOID.mcarlo import Metropolis, Action


def example_fitness(number):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import numpy as np
import unittest as ut

from moldocker.mcarlo import MonteCarlo
from moldocker.fitness import Fitness
from VOID.mcarlo import MonteCarlo
from VOID.fitness import Fitness

from moldocker.tests.test_inputs import load_structure, load_molecule
from VOID.tests.test_inputs import load_structure, load_molecule


class ExampleMC(MonteCarlo):
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion moldocker/samplers/base.py → VOID/samplers/base.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import numpy as np

from moldocker.object import ParseableObject
from VOID.object import ParseableObject


class Sampler(ParseableObject):
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import numpy as np
import unittest as ut

from moldocker.samplers import RandomSampler
from moldocker.tests.test_inputs import load_structure, load_molecule
from VOID.samplers import RandomSampler
from VOID.tests.test_inputs import load_structure, load_molecule


class TestRandomSampler(ut.TestCase):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import numpy as np
import unittest as ut

from moldocker.samplers import OriginSampler
from moldocker.tests.test_inputs import load_structure, load_molecule
from VOID.samplers import OriginSampler
from VOID.tests.test_inputs import load_structure, load_molecule


class TestSampler(ut.TestCase):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import numpy as np
import unittest as ut

from moldocker.samplers import VoronoiSampler, VoronoiClustering
from moldocker.tests.test_inputs import load_structure, load_molecule
from VOID.samplers import VoronoiSampler, VoronoiClustering
from VOID.tests.test_inputs import load_structure, load_molecule


class TestVoronoi(ut.TestCase):
Expand Down
2 changes: 1 addition & 1 deletion moldocker/samplers/voronoi.py → VOID/samplers/voronoi.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from pymatgen.analysis.bond_valence import BVAnalyzer

from .base import Sampler
from moldocker.io.stdout import suppress_stdout
from VOID.io.stdout import suppress_stdout


PROBE_RADIUS = 0.1
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from pymatgen.core import Molecule, Structure

from .molecule import MoleculeTransformer
from moldocker.utils.geometry import random_rotation_matrices
from VOID.utils.geometry import random_rotation_matrices


class Complex:
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import numpy as np
import unittest as ut

from moldocker.structure import Complex
from moldocker.utils.geometry import rotation_matrix
from moldocker.tests.test_inputs import load_structure, load_molecule
from VOID.structure import Complex
from VOID.utils.geometry import rotation_matrix
from VOID.tests.test_inputs import load_structure, load_molecule


class TestComplex(ut.TestCase):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import numpy as np
import unittest as ut

from moldocker.structure import MoleculeTransformer
from moldocker.utils.geometry import rotation_matrix
from moldocker.tests.test_inputs import load_molecule
from VOID.structure import MoleculeTransformer
from VOID.utils.geometry import rotation_matrix
from VOID.tests.test_inputs import load_molecule


class TestTransformer(ut.TestCase):
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@


class Parser:
DESCRIPTION = """moldocker: a package to dock molecules
DESCRIPTION = """VOID: a package to dock molecules
to materials.
"""

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from .base import Parser
from moldocker import dockers, samplers, fitness
from VOID import dockers, samplers, fitness


class DockParser(Parser):
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy as np
import unittest as ut

from moldocker.utils.parser import DockParser
from VOID.utils.parser import DockParser


class TestParser(ut.TestCase):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy as np
import unittest as ut

from moldocker.utils.parser.base import Parser
from VOID.utils.parser.base import Parser


class TestParser(ut.TestCase):
Expand Down
2 changes: 1 addition & 1 deletion moldocker/utils/setup.py → VOID/utils/setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import os
import json
from pymatgen.core import Structure, Molecule
from moldocker import dockers, samplers, fitness
from VOID import dockers, samplers, fitness


class SetupRun:
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
import unittest as ut
from argparse import Namespace

from moldocker.utils.setup import SetupRun
from moldocker import dockers, samplers, fitness
from moldocker.tests.test_inputs import load_structure, load_molecule
from VOID.utils.setup import SetupRun
from VOID import dockers, samplers, fitness
from VOID.tests.test_inputs import load_structure, load_molecule


thisdir = os.path.dirname(os.path.abspath(__file__))
Expand Down
File renamed without changes.
6 changes: 3 additions & 3 deletions scripts/dock.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
import os
import logging

from moldocker.utils.parser import DockParser
from moldocker.utils.setup import SetupRun
from moldocker.io.cif import write_cif
from VOID.utils.parser import DockParser
from VOID.utils.setup import SetupRun
from VOID.io.cif import write_cif


if __name__ == "__main__":
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ def read(fname):


setup(
name="moldocker",
name="VOID",
version="1.0.0",
author="Daniel Schwalbe-Koda",
email="[email protected]",
url="https://github.com/dskoda/moldocker",
url="https://github.com/learningmatter-mit/VOID",
packages=find_packages("."),
scripts=["scripts/dock.py",],
python_requires=">=3.5",
install_requires=["numpy", "networkx", "pymatgen>=2020.3.2", "scikit-learn"],
license="MIT",
description="Tools to dock molecules to crystal structures",
description="Voronoi Organic-Inorganic Docking",
long_description=read("README.md"),
)

0 comments on commit 390e0e3

Please sign in to comment.