math: p_floor: Implement floor function

parallella / pal

An optimized C library for math, parallel processing and data movement

Apache License 2.0

301 stars 110 forks source link

math: p_floor: Implement floor function #208

Closed Adamszk closed 9 years ago

Adamszk commented 9 years ago

commited from Git website

mateunho commented 9 years ago

You've mixed p_erf() and p_floor() implementations within one PR.

Adamszk commented 9 years ago

@mateunho Thanks for comments. This one is really a messy job. I created a new branch through the web not remotely. Lesson learned. I will created a new branch remotely and redo again. This one will be removed. Unless you have some tricks. Meanwhile I like to comment that git gui is a very useful tool. It helps a lot.

mateunho commented 9 years ago

@Adamszk, I've checked out your current repo state and run (some tricks :smile:)

git rebase -i 6fe1782, here you pick only the one on top and squash rest of them (like here). If you don't get past this command successfully, then abort following
git branch tmp
git reset --hard 0c385c7
git cherry-pick refs/heads/tmp
git branch -D tmp

those commands seem to make the deal of course don't forget to execute git push -f origin devel2

Adamszk commented 9 years ago

@mateunho I think I screw things up even further. devel2 branch was not created locally because I made floor commit on the web.(remotely) So I created locally but did not do any further. then follow the above steps and something did not go through. git branch

(no branch, rebasing devel2) devel devel2 devel3 master git checkout devel src/math/p_add.c: needs merge error: you need to resolve your current index first

I think it will be easier if I redo everything again.