-
Notifications
You must be signed in to change notification settings - Fork 7
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
Integrate Segway Toolkit into Segway #181
Open
isaiahah
wants to merge
95
commits into
hoffmangroup:develop
Choose a base branch
from
isaiahah:gmtk-api
base: develop
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
Changes from 93 commits
Commits
Show all changes
95 commits
Select commit
Hold shift + click to select a range
05936cb
Change output to proper BED
isaiahah ef92989
Last file of BED format change
isaiahah c6c873c
Fix simpleseg test
isaiahah 4356d20
Bugfix color assignment and posterior
isaiahah a4edc87
Fix data test
isaiahah 29cc1b8
Fix multipledatasets test
isaiahah e6eafb1
Fix runroundinstance test
isaiahah eb5525e
Fix simpleconcat test
isaiahah 5db5629
Fix simpleidentifysteps test
isaiahah 7a60723
Fixed simplerecover test
isaiahah 7b389b1
Fixed simpleresolution test
isaiahah 178ac84
Fixed simplesemisupervised test
isaiahah eeffe89
Attempt to fix simplesubseg test
isaiahah 431a578
Fixed simpletrainsteps test
isaiahah 775301e
Fixed simplevirtualevidence test
isaiahah 75b1b2c
Fix Pyflakes warnings
isaiahah e0878b9
Change to coloring by superlabel
isaiahah 028f261
Bugfix extract_superlabel return type
isaiahah 82914c7
Bugfix color assignment to superlabel
isaiahah 70854a5
Begin addressing Eric's comments
isaiahah 852886f
Remove unneeded import
isaiahah 77fdf95
Begin responding to Eric's comments
isaiahah 0cecaec
Complete posterior track output
isaiahah 1cc687f
Fix data test
isaiahah 478e321
Fix runroundinstance test
isaiahah a6707ee
Attempt to fix simplesubseg test
isaiahah bb3e7e1
Bugfix multi-item context manager for py<3.9
isaiahah 87cc8c4
Cleanup comments and documentation
isaiahah 035040e
Address Eric's comments
isaiahah d488be3
In progress GMTK API integration
isaiahah 4138d48
Rename API files
isaiahah 72b11f6
Merge Segway main into GMTK API
isaiahah 354240a
flake8 fixes
isaiahah 6b892aa
Merge branch 'master' of https://github.com/hoffmangroup/segway into …
isaiahah 8c9afde
flake8 fixes
isaiahah 0aff1e1
Convert Virtual Evidence to hard coded string
isaiahah 0077e3b
Remove extra test files
isaiahah 8908295
Draft GMTK API integration
isaiahah c7eea28
Bugfix DenseCPT DirichletTable implementation
isaiahah 63615eb
Place format strings on one line
isaiahah eff60d6
Reorder sections to match template
isaiahah ebe17ea
Add conditional statement on INPUT_PARAMS_FILENAME
isaiahah 7947649
Add clause to print condition on INPUT_PARAMS_FILENAME
isaiahah f3d9819
Use Segway toolkit as official input.master
isaiahah c7e3ab1
Fix segCountDown_seg_segTransition prob shape
isaiahah 39a8f20
Print from-template input.master for testing
isaiahah 6e61b11
Bugfix filename suffix
isaiahah 39c3d58
Bugfix template input.master suffix
isaiahah f91348c
Undo previous bugfix
isaiahah dd7b63c
Attempt to debug segCountDown_seg_segTransition dimension
isaiahah edb2074
Remove support for Segway toolkit gamma distribution
isaiahah ec4ba8d
Bugfix removing Gamma distribution
isaiahah 5035df7
Add preprocessor condition on VIRTUAL_EVIDENCE
isaiahah 0ebf3a1
Add keep_shape for Dirichlet Table
isaiahah 904cb42
Fix get_header_info for Dirichlet Tables
isaiahah 3d47d64
Remove calls to InputMasterSaver class
isaiahah cfb36e0
Attempt to fix filename creation
isaiahah e5f5564
Hardcode input.master.tmpl resource name
isaiahah 2520f26
Bugfix new file creation
isaiahah ae9d1ee
Bugfix filename assignment
isaiahah 853531f
Add header and footers to sections for preprocessor conditions
isaiahah 44d2255
Bugfix line_before
isaiahah 00a419a
Add VirtualEvidence class
isaiahah 380ed43
Fix type of VirtualEvidence section
isaiahah ff66b3e
Cleanup VirtualEvidence string
isaiahah f57ff1f
Minor code cleanup
isaiahah 9b376e8
Move testing to generate input.master into save_input_master
isaiahah 5889962
Re-add INPUT_MASTER_FILENAME
isaiahah b02316b
Fix exported filename
isaiahah d096ea2
Bugfix code change
isaiahah a038925
Attempt to bugfix input_master_filename
isaiahah 97d75cf
Undo attempted changes from today
isaiahah f7f8e7b
Merge branch 'gmtk-api' of https://github.com/isaiahah/segway into gm…
isaiahah 9c26a70
Revert changes from today
isaiahah f15876a
Remove old template system for input.master
isaiahah f9a5f31
Cleanup code checking if input.master exists
isaiahah f1a873e
Continue cleanup
isaiahah 622f892
Additional code cleanup and flake8 fixes
isaiahah f3a1e52
input.master cleanup
isaiahah 6c4245d
Rename segway_input_master
isaiahah 3e960f4
Implement DirichletConst line in DPMF header
isaiahah e397c7f
Remove input.master.tmpl
isaiahah f4e28dc
flake8 fixes
isaiahah c3ed1ec
Add default preamble to support CNVway backward compatability
isaiahah 20378f2
Load decision trees from data files
isaiahah 679fe0a
Bugfix for Python3.9 (cannot check instance with generic)
isaiahah a087573
Address Eric's comments
isaiahah 8c9703b
Remove RealMat class
isaiahah df8c2db
Address Eric's comments
isaiahah 62917f9
Update OBJ_KIND for Generic String
isaiahah 72a38f8
Remove references to ArbitraryString
isaiahah 6a6e60b
flake8 fixes
isaiahah b1bef31
Rename toolkit file to params.py
isaiahah 74ebfe1
Address Michael's comments
isaiahah 072d3e8
Call make_cardinality_line more
isaiahah 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 was deleted.
Oops, something went wrong.
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 |
---|---|---|
@@ -1,4 +1,3 @@ | ||
map_frameIndex_ruler | ||
1 | ||
% is the frameIndex divisible by RULER_SCALE | ||
-1 { mod(p0, RULER_SCALE) == 0 } |
1 change: 0 additions & 1 deletion
1
segway/data/map_segTransition_ruler_seg_segCountDown_segCountDown.dt.tmpl
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 |
---|---|---|
@@ -1,4 +1,3 @@ | ||
map_segTransition_ruler_seg_segCountDown_segCountDown | ||
4 | ||
0 2 2 default | ||
% segTransition(0) == 2 (seg transition): | ||
|
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 |
---|---|---|
@@ -1,4 +1,3 @@ | ||
map_seg_segCountDown | ||
1 | ||
% this is only used at the beginning of an observation track | ||
0 $tree |
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 |
---|---|---|
@@ -1,5 +1,2 @@ | ||
% XXXopt: good candidate for a linear combination C deterministic mapper | ||
|
||
map_seg_subseg_obs | ||
2 % num parents | ||
-1 { p0*CARD_SUBSEG + p1 } |
1 change: 0 additions & 1 deletion
1
segway/data/map_supervisionLabel_seg_alwaysTrue_semisupervised.dt.txt
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
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. How about just 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. Changed. |
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 |
---|---|---|
@@ -0,0 +1,5 @@ | ||
#include "$include_file" | ||
|
||
#if CARD_SEG != $card_seg | ||
#error Specified number of segment labels (CARD_SEG) does not match the number used for this input master file ($card_seg) | ||
#endif |
Oops, something went wrong.
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.
Can you please restore this comment?
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.
Actually, it might be better to move it to whatever Python code calls this so it isn't copied into every project.
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.
I've moved this comment (verbatim) to the Python code which loads this file. See
input_master.py
line 121.