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

fastSmoothEmd and style fixes #149

Open
wants to merge 95 commits into
base: master
Choose a base branch
from
Open

fastSmoothEmd and style fixes #149

wants to merge 95 commits into from

Conversation

jack89roberts
Copy link
Contributor

Contains both #146 and #148

@andeElliott
added smooth c++ file
93ea66c
@andeElliott
fixed a few annoying bugs in the implementation.
d4d7d84 
This version appears to work, not sure if doing this from the other perspective would be better
@andeElliott
Modifications to add the c code into the function
92d2abd 
Also remoing some uneeded c code.
@andeElliott
removed 1 if statement out of the loop
1dda134
@andeElliott
added speed test for smooth version
5ef89bd
@andeElliott
removed some of the print messages
4496097
@andeElliott
added the new methods to the namespace for exports
80cd6df
@andeElliott
commented and removing unneeded code
c0a28e8
@andeElliott
Merge branch 'master' into fastSmoothEMD
87bd247
@andeElliott
figuring out what is wrong
3e09482
@andeElliott
removing changes to see if it helps
87d00b7
@andeElliott
Inital working version of fastEmdSmooth
761898d 
Very inefficient (double for loop), but it works and can easily be refined
@andeElliott
fixed small bug
b7a6674
@andeElliott
missed a few internal paths used for testing
6b64eb2
@andeElliott
adding the V2 to namespace
40dddeb
@andeElliott
updated versions of wrapper files
b19b6fe
@andeElliott
stable version
15ee86b
@andeElliott
updated iupdated
d959a79
@andeElliott
updated test
c7b1cc2
@andeElliott
updated tests
b5bc0a8
@andeElliott
Merge branch 'newBranch' into fastSmoothEMD
0cec4ed
@andeElliott
added old failure case. as a test
5ed553e
@andeElliott
first real fast version
cac3bab
@andeElliott
working partially cleaned version
deae045 
next step pulling edge case out of loop
@andeElliott
current working version
f4c816a
@andeElliott
updated file naming
dc7e53d
@andeElliott
new fast smooth file
9c99088
@andeElliott
changed name of old version
10d7de8
@andeElliott
removed sourceCpp
cc76a3b
@andeElliott
fixed introduced bug
aa1f6e8
jack89roberts and others added 22 commits June 7, 2022 12:30
@jack89roberts
Merge branch 'lint' of https://github.com/alan-turing-institute/netwo…
d37bf58 
…rk-comparison into lint
@ots22
Regenerated NAMESPACE and RcppExports.R after devtools::document()
f11f068
@jack89roberts
vignette line length fixes
f31de5b
@jack89roberts
Update documentation (bot)
9321552
@jack89roberts
linting fixes
a3ddebc 
seq_len instead of 1:length
variable name lengths
snake case names
remove unused vars
@jack89roberts
Merge branch 'lint' of https://github.com/alan-turing-institute/netwo…
c31823f 
…rk-comparison into lint
@jack89roberts
revert breaking lint changes
1a98f23 
seq_len
incorrectly find/replaced function names
@jack89roberts
ignore remaining lint errors where appropriate
2e9348f
@jack89roberts
delete area_between_offset_ecmfs
fb0f92e 
unused and incorrectly named arguments
@jack89roberts
update .Rbuildignore
d9d6f5f
@jack89roberts
Update documentation (bot)
8313127
@ots22
Update to renamed function in test case
13eba31
@ots22
Use Kahan summation in NetEmdSmoothV2
d3ab662
@ots22
Remove old unused versions of fastSmooth
a543607
@andeElliott
adding tests with previous version rather than integrate
b0eb0a5
@andeElliott
Merge branch 'fastSmoothEMD-review' of github.com:alan-turing-institu…
2abf918 
…te/network-comparison into fastSmoothEMD-review
@jack89roberts
Merge branch 'lint' into fastSmoothEMD-review
549b497
@jack89roberts
linting
2158ae5
@jack89roberts
net_emd -> netemd throughout
9fc4427
@jack89roberts
more linting
de4a41a
@jack89roberts
update docs
5388779
@jack89roberts
net_dis net_emd -> netdis netemd in file names
fa187db
@jack89roberts jack89roberts changed the title Fast smooth emd lint merge Fast smooth emd lint - Style checks and fixes (merge) Jun 9, 2022
@jack89roberts jack89roberts changed the title Fast smooth emd lint - Style checks and fixes (merge) Style checks and fixes (merge after Fast smooth emd lint) Jun 10, 2022
@jack89roberts jack89roberts mentioned this pull request Jun 10, 2022
Closed
@ots22 ots22 changed the title Style checks and fixes (merge after Fast smooth emd lint) fastSmoothEmd and style fixes Jun 10, 2022
This was referenced Jun 10, 2022
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andeElliott andeElliott Awaiting requested review from andeElliott

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jack89roberts @andeElliott @ots22 @leospinaf