This repository has been archived by the owner on Mar 27, 2018. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 9
Spg update #574
Open
c-mita
wants to merge
11
commits into
master
Choose a base branch
from
spg_update
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Spg update #574
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
5fa939e
Replace scanpointgenerator copy with state at e5bea226 from spg repo
c-mita c34377f
Change scisoftpy to numjy in scanpointgenerator compat.py
c-mita b713176
Adjust jython_spg_interface.py to handle changes to spg interface
c-mita 338c70e
Add validation to input units in scanpointgenerator
c-mita 311db92
Add a parse method to Point
c-mita fb36b4c
Fixup unit tests after scanpointgenerator changes
c-mita af0f340
Restore Excluders in CompoundSpgIterator
c-mita ab2b2ed
Fix GridWithROI scan test to not exclude all points with its region
c-mita 09ccd3f
Add ArrayGenerator (from WIP branch in ScanPointGenerator)
c-mita 48d90a0
ArrayGenerator fixes
c-mita 3c6ad04
Collapse indexes in jython_spg_interface when excluders join axes
c-mita File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,6 +16,8 @@ | |
import java.util.LinkedHashMap; | ||
import java.util.List; | ||
import java.util.Map; | ||
import java.util.regex.Matcher; | ||
import java.util.regex.Pattern; | ||
|
||
import org.eclipse.scanning.api.annotation.UiHidden; | ||
|
||
|
@@ -133,4 +135,21 @@ public Map<String, Integer> getIndices() { | |
} | ||
return indices; | ||
} | ||
|
||
private static final String VERTEX = "([a-zA-Z0-9_])+\\((\\d+)\\)=([-+]?[0-9]*\\.?[0-9]+)"; | ||
private static final Pattern POSITION = Pattern.compile(VERTEX + ", " + VERTEX); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
|
||
/** | ||
* Parse a point from the toString() method into an instance of Point | ||
* @param asString | ||
* @return | ||
*/ | ||
public static Point parse(String asString) { | ||
Matcher m = POSITION.matcher(asString); | ||
if (m.matches()) { | ||
return new Point(m.group(4), Integer.parseInt(m.group(5)), Double.parseDouble(m.group(6)), | ||
m.group(1), Integer.parseInt(m.group(2)), Double.parseDouble(m.group(3))); | ||
} | ||
throw new RuntimeException("Unparsable string" + asString); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Move this variable to comply with Java Code Conventions.