Skip to content

Commit

Permalink
Merge branch 'master' of github.com:JuliaLang/julia
Browse files Browse the repository at this point in the history
  • Loading branch information
StefanKarpinski committed Feb 28, 2012
2 parents 38913bd + e8dc378 commit 0163927
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 30 deletions.
2 changes: 1 addition & 1 deletion Make.inc
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ USECLANG = 0
ifeq ($(USEGCC),1)
CC = gcc
CXX = g++
CFLAGS = -pipe -std=gnu99 -fPIC
CFLAGS = -pipe -std=gnu99 -fPIC -fno-strict-aliasing
CXXFLAGS = -pipe -fPIC -fno-rtti
DEBUGFLAGS = -ggdb3 -DDEBUG
SHIPFLAGS = -O3 -DNDEBUG -falign-functions -momit-leaf-frame-pointer
Expand Down
25 changes: 0 additions & 25 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,31 +91,6 @@ Other versions of gcc are also available but gfortran45 is the one use by all th

**Use the gmake command on FreeBSD instead of make**

On FreeBSD two of the unit tests of flisp fail at the moment. Until this is fixed you can comment them out:

diff --git a/src/flisp/unittest.lsp b/src/flisp/unittest.lsp
index 9ebd491..3b0df0e 100644
--- a/src/flisp/unittest.lsp
+++ b/src/flisp/unittest.lsp
@@ -77,7 +77,7 @@
(assert (equal? (string 'sym #byte(65) #wchar(945) "blah") "symA\u03B1blah"))

; NaNs
-(assert (equal? +nan.0 +nan.0))
+;;;(assert (equal? +nan.0 +nan.0))
(assert (not (= +nan.0 +nan.0)))
(assert (not (= +nan.0 -nan.0)))
(assert (equal? (< +nan.0 3) (> 3 +nan.0)))
@@ -92,7 +92,7 @@

; -0.0 etc.
(assert (not (equal? 0.0 0)))
-(assert (equal? 0.0 0.0))
+;;;(assert (equal? 0.0 0.0))
(assert (not (equal? -0.0 0.0)))
(assert (not (equal? -0.0 0)))
(assert (not (eqv? 0.0 0)))

<a name="Required-Build-Tools-External-Libraries"/>
## Required Build Tools & External Libraries

Expand Down
8 changes: 4 additions & 4 deletions j/math.j
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@ function polyint(a::AbstractVector, k::Number)
end
polyint(a::AbstractVector) = polyint(a, 0)

function poly(A::Matrix)
n = size(A)[1]
z, ignored = eig(A)
function poly(r::AbstractVector)
n = length(r)
c = zeros(n+1,1)
c[1] = 1
for j = 1:n
c[2:j+1] = c[2:j+1]-z[j]*c[1:j]
c[2:j+1] = c[2:j+1]-r[j]*c[1:j]
end
return c
end
poly(A::Matrix) = poly(eig(A)[1])

0 comments on commit 0163927

Please sign in to comment.