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

Fast smooth emd review #148

Closed
wants to merge 67 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
93ea66c
added smooth c++ file
andeElliott Jun 1, 2018
d4d7d84
fixed a few annoying bugs in the implementation.
andeElliott Jun 1, 2018
92d2abd
Modifications to add the c code into the function
andeElliott Jun 3, 2018
1dda134
removed 1 if statement out of the loop
andeElliott Jun 3, 2018
5ef89bd
added speed test for smooth version
andeElliott Jun 5, 2018
4496097
removed some of the print messages
andeElliott Jun 18, 2018
80cd6df
added the new methods to the namespace for exports
andeElliott Jun 18, 2018
c0a28e8
commented and removing unneeded code
andeElliott Nov 14, 2019
87bd247
Merge branch 'master' into fastSmoothEMD
andeElliott Nov 14, 2019
3e09482
figuring out what is wrong
andeElliott Nov 14, 2019
87d00b7
removing changes to see if it helps
andeElliott Nov 14, 2019
761898d
Inital working version of fastEmdSmooth
andeElliott Nov 20, 2019
b7a6674
fixed small bug
andeElliott Nov 20, 2019
6b64eb2
missed a few internal paths used for testing
andeElliott Nov 20, 2019
40dddeb
adding the V2 to namespace
andeElliott Nov 20, 2019
b19b6fe
updated versions of wrapper files
andeElliott Nov 20, 2019
15ee86b
stable version
andeElliott Nov 20, 2019
d959a79
updated iupdated
andeElliott Nov 21, 2019
c7b1cc2
updated test
andeElliott Nov 21, 2019
b5bc0a8
updated tests
andeElliott Nov 21, 2019
0cec4ed
Merge branch 'newBranch' into fastSmoothEMD
andeElliott Nov 21, 2019
5ed553e
added old failure case. as a test
andeElliott Nov 22, 2019
cac3bab
first real fast version
andeElliott Nov 22, 2019
deae045
working partially cleaned version
andeElliott Nov 22, 2019
f4c816a
current working version
andeElliott Nov 25, 2019
dc7e53d
updated file naming
andeElliott Nov 25, 2019
9c99088
new fast smooth file
andeElliott Nov 25, 2019
10d7de8
changed name of old version
andeElliott Nov 25, 2019
cc76a3b
removed sourceCpp
andeElliott Nov 25, 2019
aa1f6e8
fixed introduced bug
andeElliott Nov 25, 2019
6f7a515
updated the code
andeElliott Nov 26, 2019
8000fa1
replace missing file
andeElliott Nov 26, 2019
1f5d9d7
Formatting and whitespace
ots22 Apr 17, 2020
91c9561
Formatting
ots22 Apr 17, 2020
9151e52
Local for-loop index
ots22 Apr 17, 2020
b35563e
Combine some conditional cases in get_segment
ots22 Apr 17, 2020
0ca7c89
Combine cases for handling the leftmost segments (NetEmdSmoothV2)
ots22 Apr 17, 2020
c36c3f6
Remove unused function
ots22 Apr 17, 2020
4af238d
Rename loop counters
ots22 Apr 17, 2020
3feb0ae
added tests
andeElliott Apr 17, 2020
a398920
Iterable class to interleave two sequences in the required way
ots22 Apr 20, 2020
c302c43
added fast smooth header
andeElliott Apr 21, 2020
4b57f15
Merge branch 'fastSmoothEMD-review' of https://github.com/alan-turing…
andeElliott Apr 21, 2020
89bba30
updated tests
andeElliott Apr 21, 2020
5436310
remove browser
andeElliott Apr 21, 2020
ce8cbb3
Merge branch 'master' into fastSmoothEMD-review
andeElliott Apr 21, 2020
5c4dd42
Iterate over overlapping intervals
ots22 Apr 22, 2020
77b9338
Move overlapping segment iterator into fastSmoothV2.h
ots22 Apr 22, 2020
72de9ea
Use NumericVectors in tests
ots22 Apr 22, 2020
8e12200
Use overlapping interval iterator in NetEmdSmoothV2
ots22 Apr 22, 2020
857c91c
Small refactor of OverlappingSegments, and use for NetEmdSmoothV2
ots22 Apr 23, 2020
17ef75e
Small formatting changes
ots22 Apr 23, 2020
a67c2ce
Move begin() and end() after iterator class (fix breaking build)
ots22 Apr 23, 2020
a59cc6f
test
leospinaf Jun 23, 2020
1fd6fb7
removed the flag for sse to test if this will work on M1
andeElliott May 18, 2022
66f9f8f
attempt2 to fix the M1 issues
andeElliott May 18, 2022
dcff9a3
adding arg back in to see if it is needed
andeElliott May 18, 2022
e569025
Merge branch 'M1fix' into fastSmoothEMD-review-m1
andeElliott May 18, 2022
0a04e3b
updated Rcpp Exports
andeElliott May 18, 2022
474d895
update namespace to test if functions will export
andeElliott May 18, 2022
7c8055c
Merge branch 'master' into fastSmoothEMD-review
ots22 Jun 7, 2022
f11f068
Regenerated NAMESPACE and RcppExports.R after devtools::document()
ots22 Jun 7, 2022
13eba31
Update to renamed function in test case
ots22 Jun 8, 2022
d3ab662
Use Kahan summation in NetEmdSmoothV2
ots22 Jun 8, 2022
a543607
Remove old unused versions of fastSmooth
ots22 Jun 8, 2022
b0eb0a5
adding tests with previous version rather than integrate
andeElliott Jun 8, 2022
2abf918
Merge branch 'fastSmoothEMD-review' of github.com:alan-turing-institu…
andeElliott Jun 8, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixed small bug
  • Loading branch information
andeElliott committed Nov 20, 2019
commit b7a667436517b93b564dda0db84146626396e857
2 changes: 0 additions & 2 deletions tests/testthat/test_fastEMD.R
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ test_that("2 element test w1=0.1, w2=0.2", {

test_that("3 element test Mixture", {

sourceCpp("~/Documents/network-comparison/src/fastSmoothV2.cpp")
for (w1 in (1:10)/10.0)
{
for (w2 in (1:10)/10.0)
Expand All @@ -138,7 +137,6 @@ test_that("3 element test Mixture", {

test_that("3 element test w1=0.1, w2=0.2", {

sourceCpp("~/Documents/network-comparison/src/fastSmoothV2.cpp")
w1 = 0.1
w2 = 0.2
x1 <- c(1,2,3)
Expand Down