Merge pull request #2 from jiahao/master

merge from master

Author: dlfivefifty

.travis.yml

@@ -1,20 +1,21 @@
 language: cpp
 compiler:
-  - clang
+    - clang
 notifications:
-  email: false
+    email: false
 env:
-  matrix: 
     - JULIAVERSION="juliareleases" 
     - JULIAVERSION="julianightlies" 
 before_install:
-  - sudo add-apt-repository ppa:staticfloat/julia-deps -y
-  - sudo add-apt-repository ppa:staticfloat/${JULIAVERSION} -y
-  - sudo apt-get update -qq -y
-  - sudo apt-get install libpcre3-dev julia -y
+    - sudo add-apt-repository ppa:staticfloat/julia-deps -y
+    - sudo add-apt-repository ppa:staticfloat/${JULIAVERSION} -y
+    - sudo apt-get update -qq -y
+    - sudo apt-get install libpcre3-dev julia -y
+    - git config --global user.name "Travis User"
+    - git config --global user.email "travis@example.net"
+    - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
 script:
-  - julia -e 'Pkg.init(); run(`ln -s $(pwd()) $(Pkg.dir("RandomMatrices"))`); Pkg.pin("RandomMatrices"); Pkg.resolve()'
-  - if [ $JULIAVERSION = "julianightlies" ]; then julia --code-coverage test/runtests.jl; fi
-  - if [ $JULIAVERSION = "juliareleases" ]; then julia test/runtests.jl; fi
+    - julia -e 'Pkg.init(); Pkg.clone(pwd())'
+    - julia -e 'Pkg.test("RandomMatrices", coverage=true)'
 after_success:
-  - if [ $JULIAVERSION = "julianightlies" ]; then julia -e 'cd(Pkg.dir("RandomMatrices")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'; fi
+    - julia -e 'cd(Pkg.dir("RandomMatrices")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'

LICENSE.md

@@ -1,6 +1,7 @@
 The RandomMatrices Julia module is licensed under the MIT License:
 
-> Copyright (c) 2013: Jiahao Chen, Alan Edelman and Jameson Nash
+> Copyright (c) 2013-2014: Jiahao Chen, Alan Edelman, Jameson Nash, Sheehan
+> Olver and other contributors
 >
 > Permission is hereby granted, free of charge, to any person obtaining
 > a copy of this software and associated documentation files (the

README.md

@@ -11,16 +11,15 @@ samples and their associated distributions are provided.
 The names of the various ensembles can vary widely across disciplines. Where possible,
 synonyms are listed.
 
-## License
-Copyright (c) 2013 [Jiahao Chen](https://github.com/jiahao) <jiahao@mit.edu>
-
-Distributed under the [MIT License](http://opensource.org/licenses/MIT).
-
 [![Build Status](https://travis-ci.org/jiahao/RandomMatrices.jl.png?branch=master)](https://travis-ci.org/jiahao/RandomMatrices.jl)
-[![RandomMatrices](http://pkg.julialang.org/badges/RandomMatrices_0.2.svg)](http://pkg.julialang.org/?pkg=RandomMatrices&ver=0.2)
-[![RandomMatrices](http://pkg.julialang.org/badges/RandomMatrices_0.3.svg)](http://pkg.julialang.org/?pkg=RandomMatrices&ver=0.3)
+[![RandomMatrices](http://pkg.julialang.org/badges/RandomMatrices_release.svg)](http://pkg.julialang.org/?pkg=RandomMatrices&ver=release)
+[![RandomMatrices](http://pkg.julialang.org/badges/RandomMatrices_nightly.svg)](http://pkg.julialang.org/?pkg=RandomMatrices&ver=nightly)
 [![Coverage Status](https://img.shields.io/coveralls/jiahao/RandomMatrices.jl.svg)](https://img.shields.io/coveralls/jiahao/RandomMatrices.jl.svg)
 
+Additional functionality is provided when these optional packages are installed:
+- Symbolic manipulation of Haar matrices with [GSL.jl](https://github.com/jiahao/GSL.jl)
+- Invariant ensembles with [ApproxFun.jl](https://github.com/dlfivefifty/ApproxFun.jl)
+
 # Gaussian matrix ensembles
 
 Much of classical random matrix theory has focused on matrices with matrix elements comprised of

REQUIRE

@@ -1,4 +1,4 @@
-julia 0.3-
-Catalan
+julia 0.3
+Combinatorics
 Distributions
 ODE

src/.FormalPowerSeries.jl.swp

@@ -1,5 +1,3 @@
-using Catalan
-
 export permutations_in_Sn, compose, cycle_structure, data, part, #Functions working with partitions and permutations
     partition, Haar, expectation, WeingartenUnitary
 
@@ -144,7 +142,7 @@ function expectation(X::Expr)
     ##################################
     # Step 2. Enumerate permutations #
     ##################################
-    AllTerms = {}
+    AllTerms = Any[]
     for sigma in @task permutations_in_Sn(n)
         for tau in @task permutations_in_Sn(n)
             sigma_inv=permutation_inverse(sigma)
@@ -188,7 +186,7 @@ function expectation(X::Expr)
             println("START PARSING")
             println("The term is =", ReindexedSymbols[end])
             Symb, left_idx, right_idx = pop!(ReindexedSymbols)
-            Expression={{{Symb}, left_idx, right_idx}}
+            Expression=[Any[Symbol[Symb], left_idx, right_idx]]
             while length(ReindexedSymbols) > 0
                 pop_idx = expr_idx = do_transpose = is_left = nothing
                 for expr_iter in enumerate(Expression)
@@ -229,7 +227,7 @@ function expectation(X::Expr)
                 if pop_idx == nothing #Found nothing, start new expression blob
                 println("New word: The term is ", ReindexedSymbols[1])
                     Symb, left_idx, right_idx = delete!(ReindexedSymbols, 1)
-                    push!(Expression, {{Symb}, left_idx, right_idx})
+                    push!(Expression, [Symbol[Symb], left_idx, right_idx])
                 else #Found something
                     println("The term is =", ReindexedSymbols[pop_idx])
                     Symb, col_idx, row_idx = delete!(ReindexedSymbols, pop_idx)
@@ -246,7 +244,7 @@ function expectation(X::Expr)
             println("DONE PARSING TREE")
 
             # Evaluate closed cycles
-            NewExpression={}
+            NewExpression=Any[]
             for ExprChunk in Expression
                 ExprBlob, start_idx, end_idx = ExprChunk
                 print(ExprChunk, " => ")