Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JSON interface update #44

Merged
merged 5 commits into from Oct 31, 2018
Merged

JSON interface update #44

merged 5 commits into from Oct 31, 2018

Conversation

dgasmith
Copy link
Contributor

This PR does the following:

  • Moves JSON specification to zero-index (will impact torsion drive)
  • Pins QCEngine version via GitHub, so we can look at the latest release and the latest version
  • Adds a new constraint specification that looks like:
    constraint_dict = {
        'freeze': [{
            "type": ("xyz", [0, 1, 2])
        }],
        'set': [{
            "type": ("angle", [1, 0, 4]),
            "value": 110.0
        }],
        'scan': [{
            "type": ("distance", [1, 0]),
            "start": 1.0,
            "stop": 1.2,
            "steps": 3
        }, {
            "type": ('dihedral', [0, 4, 5, 6]),
            "start": 110.0,
            "stop": 150.0,
            "steps": 3
        }]
    }

@codecov-io
Copy link

Codecov Report

Merging #44 into master will increase coverage by 3.33%.
The diff coverage is 90.32%.

@dgasmith
Copy link
Contributor Author

@leeping Ready to go if you are happy with it.

@leeping
Copy link
Owner

leeping commented Oct 31, 2018

Thank you very much for adding this. :) I've reviewed and I'll merge it now.

@dgasmith
Copy link
Contributor Author

dgasmith commented Nov 6, 2018

As a note the final dict looks like:

    constraint_dict = {
        'freeze': [{
            "type": "xyz", 
            "indices": [0, 1, 2]
        }],
        'set': [{
            "type": "angle", 
            "indices": [1, 0, 4],
            "value": 110.0
        }],
        'scan': [{
            "type": "distance",
            "indicies": [1, 0],
            "start": 1.0,
            "stop": 1.2,
            "steps": 3
        }, {
            "type": 'dihedral',
            "indices": [0, 4, 5, 6],
            "start": 110.0,
            "stop": 150.0,
            "steps": 3
        }]
    }

@dgasmith dgasmith deleted the json branch March 1, 2019 13:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants