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.

Sign up for GitHub

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

Jump to bottom

Development Branch #172

Merged
merged 254 commits into from
Feb 18, 2014
Merged

Development Branch #172

merged 254 commits into from
Feb 18, 2014

Conversation

fgregg
Copy link
Contributor

@fgregg fgregg commented Jan 4, 2014

No description provided.

@nikitsaraf
Add test for predicateType
f77a2a2
@nikitsaraf
Add more test for blockTraining
d72b8f8
@nikitsaraf
Add test for Simple Predicate and Canopy Overlap
9808c14
@nikitsaraf
Fix bug in Canopy Overlap test and add simple test for InvertIndex
bdc70b3
@nikitsaraf @fgregg
Add example csv files to be used for testing Data Matching
0d80fde
@nikitsaraf @fgregg
Create new example file for Data Matching problem
37c3611
@nikitsaraf @fgregg
Pull the Changes csv_example.py to csv_data_matching.py
65a00f6
@nikitsaraf @fgregg
Generate Random pairs for the data_sample such that each record is fr…
66da487 
…om different dataset
@nikitsaraf @fgregg
Add only the records from first database to the corpus_ids
4a5ce7b
@nikitsaraf @fgregg
Change the dataset attribute of the records of data dictionary
d46197d
@nikitsaraf @fgregg
Include only the records from database_2 to the candidate set
677761e
@nikitsaraf @fgregg
Generate Blocked Pairs correctly so that both the records are from di…
d723a48 
…fferet datasets
@nikitsaraf @fgregg
Forgot to remove merge conflicts
d7368a9
@nikitsaraf @fgregg
Solve Minor Bugs
1d24a07
@nikitsaraf @fgregg
Fix the error with corpus id
b4cfc3c
@nikitsaraf @fgregg
Change blockedPairs to handle the keys of the records
ba1f0ac
@nikitsaraf @fgregg
More Bug Fix
c34989c
@nikitsaraf @fgregg
Add const_matching flag to dataSample function
3a0fba7
@nikitsaraf @fgregg
Add const_matching flag to all the required functions
3d7b0f4
@nikitsaraf @fgregg
Change const_matching to constrained_matching and 0s to False
dad179a
@nikitsaraf @fgregg
Undo the changes to canonical_test
c8aa4bf
@nikitsaraf @fgregg
Fix bug in canonical_test
1b66fe8
@nikitsaraf @fgregg
Use min() instead of if and else comparison
47743de
@nikitsaraf @fgregg
Add the first element of data_list at the end again, as the probablit…
091d2f9 
…y of it beign selected was zero
@nikitsaraf @fgregg
Fix blockedPairs to accomodate it even when the key is not an int
c78a961
@nikitsaraf @fgregg
Create new function randomPairMatch to generate Random Pairs for Data…
e651ff6 
… Matching
@nikitsaraf @fgregg
Use numpy.random.randint to generate sample with replacement
7a28aaa
@nikitsaraf @fgregg
Constrained OOP Refator
f607766
@nikitsaraf @fgregg
Add the SingleDataSet and ConstrainedDataSets
92ddc49
@nikitsaraf @fgregg
Canonical Testing for Data-Matching
d2b1d78
@fgregg
docstrings, docstrings
ef87d75
@fgregg
docstrings, docstrings
79dc584
@fgregg
Revert "show how threading could work"
35f3cd9 
This reverts commit 02b1f85.
@fgregg
fix sample and format docstrings
8a47747
@fgregg
bump version number to 0.5
93e62f4
@fgregg
Update api.py
9583345
@fgregg
update install and record_linkage example
de4a14c
@fgregg
Update README.md
e2b8068
@fgregg
rename dataset_matching to record_linkage_example
636f1a4
@fgregg
Update README.md
ebbeacc
@fgregg
Update README.md
6147e6b
@fgregg
docstrings for readTraining
24dac68
@fgregg
remove _blockedPairs from public methods
dc73f13
@fgregg
update tests now that blockedPairs is a private methdo
aa602c7
@fgregg
resolved conflicts
166b846
@fgregg
fix bug in intiizling active learning, add zope.interface to requirem…
31d1ec8 
…ents
@fgregg
Changelog and Contributor files
d676f7d
@fgregg
clean up singleton code
7c33d9e
@fgregg
Merge branch 'master' into development
f3105b4
@fgregg
path issue
661bd9e
@fgregg
path issue
bfbffb6
@fgregg
path issue
b06620e
@fgregg
changing sampe size
4f28409
@fgregg
Revert "path issue"
2decf43 
This reverts commit b06620e.
@fgregg
Revert "Revert "path issue""
85229b3 
This reverts commit 2decf43.
@fgregg
Revert "changing sampe size"
f281677 
This reverts commit 4f28409.
@fgregg
full run
69e60e9
fgregg added a commit that referenced this pull request Feb 18, 2014
@fgregg
Merge pull request #172 from open-city/development
a6fce1a 
Development Branch
@fgregg fgregg merged commit a6fce1a into master Feb 18, 2014
@fgregg fgregg deleted the development branch February 18, 2014 02:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@fgregg @nikitsaraf @derekeder