Merge pull request #12 from dlfivefifty/master

jiahao · jiahao · commit e7dc127bf462 · 2014-07-15T21:58:31.000-07:00
Imported Base.rand to fix rand(Haar)
diff --git a/src/HaarMeasure.jl b/src/HaarMeasure.jl
@@ -1,5 +1,5 @@
-export rand, NeedPiecewiseCorrection
-import Base.rand
+export NeedPiecewiseCorrection
+
 
 # Computes samplex of real or complex Haar matrices of size nxn
 #
diff --git a/src/RandomMatrices.jl b/src/RandomMatrices.jl
@@ -6,6 +6,8 @@ module RandomMatrices
 importall Distributions
 using Catalan
 
+import Base.rand
+
 #If the GNU Scientific Library is present, turn on additional functionality.
 _HAVE_GSL = try
   using GSL
diff --git a/test/FormalPowerSeries.jl b/test/FormalPowerSeries.jl
@@ -4,7 +4,7 @@
 #
 # Jiahao Chen <jiahao@mit.edu> 2013
 
-using Test
+using Base.Test
 using RandomMatrices
 
 MaxSeriesSize=10

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-export rand, NeedPiecewiseCorrection`
`2`		`-import Base.rand`
	`1`	`+export NeedPiecewiseCorrection`
	`2`	`+`
`3`	`3`
`4`	`4`	`# Computes samplex of real or complex Haar matrices of size nxn`
`5`	`5`	`#`