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

WIP: Quantiles of vector of infinities #19659

Merged
merged 5 commits into from
Jan 3, 2017
Merged

WIP: Quantiles of vector of infinities #19659

merged 5 commits into from
Jan 3, 2017

Conversation

alexhallam
Copy link
Contributor

A fix for issue #19542

@@ -683,7 +683,11 @@ end
else
a = T(v[i])
b = T(v[i+1])
return a + h*(b-a)
if isfinite(a) && isfinite(b)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

spaces, not tabs

@andreasnoack
Copy link
Member

andreasnoack commented Dec 20, 2016

Looks good but needs a rebase.

@alexhallam
Copy link
Contributor Author

Sorry, @andreasnoack, this is embarrassing. Do you have a reference on how to rebase this? Thanks for the patience.

@andreasnoack
Copy link
Member

Try searching for "github rebase PR" or similar. Most of the hits might give more information than necessary. The steps I do are

  1. git checkout [PR branch]
  2. git fetch origin
  3. git rebase origin/master
  4. ...CONFLICTS...
  5. Search for places with <<< in base/statistics.jl and test/statistics.jl and resolve the conflicts
  6. git add base/statistics.jl test/statistics.jl
  7. git rebase --continue
  8. git push --force fork [PR branch]

In theory, I should also be able to do this here on GitHub but the web editor hangs.

i = trunc(Int,t0) + 1

if h == 0
return T(v[i])
else
a = T(v[i])
b = T(v[i+1])
return a + ifelse(a == b, zero(a), h*(b-a))
if isfinite(a) && isfinite(b)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

agains, please use (multiples of) 4 space indent, not tabs

@tkelman tkelman dismissed their stale review December 22, 2016 05:22

needs squashing but looks okay now

@StefanKarpinski StefanKarpinski merged commit 0f2b22b into JuliaLang:master Jan 3, 2017
@certifiedloud
Copy link

🎉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants