search

berkeley-stat159 / project-theta

BSD 3-Clause "New" or "Revised" License
0 stars 4 forks source link

update regression function and script: adding linear/quad drift #70

Closed changsiyao closed 8 years ago

changsiyao commented 8 years ago

Added linear and quadratic drift. Haven't add smoothing function yet, will do that soon. Just want to upload the things I have for now.

BenjaminHsieh commented 8 years ago

Ok I will update the test functions

changsiyao commented 8 years ago

Now, I have no idea how to merge the conflict...

BenjaminHsieh commented 8 years ago

0.0 commit the files in your current branch first, then pull the changes, you will probably get merge conflicts message, then You have to manually go through the each merge conflict file and follow the answer to

http://stackoverflow.com/questions/24103490/need-help-to-understand-merge-conflict-example

then re-commit and push

BenjaminHsieh commented 8 years ago

lmk tomorrow if you cannot get it to work, then I will just copy and paste your code and update it

changsiyao commented 8 years ago

OK, fixed merge conflicts. :D

BenjaminHsieh commented 8 years ago

ok good, someone else can give this a check?

briankleinqiu commented 8 years ago

Not all the input/output is updated to include the drifts but doesn't really matter, it looks good, thanks for the work you guys