search

brandtg / stl-java

A Java implementation of STL
Apache License 2.0
21 stars 17 forks source link

Periodic Mean Smoothing #3

Closed hntd187 closed 8 years ago

hntd187 commented 8 years ago

Since Greg and I agreed that it would be fruitless to try and chase the numeric precision I added in the periodic mean smoothing. I'm including 2 plots of the difference in it for comparison purposes.

hntd187 commented 8 years ago

Duh, sorry, I'll fix these merge conflicts.

hntd187 commented 8 years ago

Hmmm, okay what the hell is going on here? Should I reopen this?

brandtg commented 8 years ago

You might need to sync with master and rebase. This article might help https://help.github.com/articles/syncing-a-fork/

Sorry I had to change the name of some classes to be consistent with the style guide, so that may have screwed with things.

It might be easier to just do the sync then create a new pull request with your commit.

hntd187 commented 8 years ago

Yea, I'm not sure what happened there, I guess I had to update the git index for the files, but all sorted out now. Yea, I realized to change the files and I updated them to find it still complaining about merge conflicts, but I suppose I had to also merge the git stuff on the internal so that git knew about the new files.

brandtg commented 8 years ago

Looks good to me