example1 and example2 now work

Author: blegat

test/example1.jl

@@ -2,8 +2,8 @@
     @polyvar x y
     p = 2x + 3.0x*y^2 + y
     @test differentiate(p, x) == 2 + 3y^2
-    @test differentiate(p, [x, y]) == [2 + 3y^2, 6x*y + 1]
-    @test p([y, x], [x, y]) == 2y + 3y*x^2 + x
-    @test subs(p, [x^2], [y]) == 2x + 3x^5 + x^2
-    @test p([1, 2], [x, y]) == 2 + 3*4 + 2
+    @test differentiate.(p, (x, y)) == (2 + 3y^2, 6x*y + 1)
+    @test p((x, y)=>(y, x)) == 2y + 3y*x^2 + x
+    @test subs(p, y=>x^2) == 2x + 3x^5 + x^2
+    @test p(x=>1, y=>2) == 2 + 3*4 + 2
 end

test/example2.jl

@@ -1,9 +1,8 @@
 @testset "Example 2" begin
-    n = 3
-    A = [1.0 2 3; 4 5 6; 7 8 9]
-    @polyvar x[1:n]
-    p = dot(x, x)
+    @polyvar x[1:3]
+    p = sum(x .* x)
     @test p == x[1]^2 + x[2]^2 + x[3]^2
-    @test p(A*x, x) == (x[1] + 2x[2] + 3x[3])^2 + (4x[1] + 5x[2] + 6x[3])^2 + (7x[1] + 8x[2] + 9x[3])^2
-    @test subs(p, [2, 3], [x[1], x[3]]) == x[2]^2 + 13
+    @test subs(p, x[1]=>2, x[3]=>3) == x[2]^2 + 13
+    A = [1.0 2 3; 4 5 6; 7 8 9]
+    @test p(x=>A*vec(x)) == (x[1] + 2x[2] + 3x[3])^2 + (4x[1] + 5x[2] + 6x[3])^2 + (7x[1] + 8x[2] + 9x[3])^2
 end

test/poly.jl

@@ -2,10 +2,10 @@
     @testset "Term" begin
         @polyvar x
         @test Any(1x) == 1x
-        @test_broken one(1x) == one(1.0x) == 1
+        @test one(1x) == one(1.0x) == 1
         @test zero(1x) == zero(1.0x) == 0
-        @test_broken nvars(0.0x) == 1
-        @test_broken nvars(1x) == 1
+        @test nvars(0.0x) == 1
+        @test nvars(1x) == 1
         #@inferred one(1x)
         @inferred zero(1x)
         #@inferred one(1.0x)
@@ -15,19 +15,19 @@
     end
     @testset "Polynomial" begin
         @polyvar x
-        @test_broken one(1 + x) == one(1.0 + x) == 1
+        @test one(1 + x) == one(1.0 + x) == 1
         @test zero(1 + x) == zero(1.0 + x) == 0
         #@inferred one(1 + x)
         @inferred zero(1 + x)
         #@inferred one(1.0 + x)
         @inferred zero(1.0 + x)
         @polyvar y
 
-        @test_broken maxdeg(x*y + 2 + x^2*y + x + y) == 3
-        @test_broken mindeg(x*y + 2 + x^2*y + x + y) == 0
-        @test_broken extdeg(x*y + 2 + x^2*y + x + y) == (0, 3)
-        @test_broken nvars(x + y - x) == 2
-        @test_broken nvars(x + x^2) == 1
+        @test maxdeg(x*y + 2 + x^2*y + x + y) == 3
+        @test mindeg(x*y + 2 + x^2*y + x + y) == 0
+        @test extdeg(x*y + 2 + x^2*y + x + y) == (0, 3)
+        @test nvars(x + y - x) == 2
+        @test nvars(x + x^2) == 1
 
         p = Polynomial([4, 9], [x, x*x])
         p.a == [9, 4]

test/runtests.jl

@@ -1,4 +1,4 @@
-using MultivariatePolynomials
+#using MultivariatePolynomials
 using Base.Test
 
 using TypedPolynomials
@@ -22,5 +22,5 @@ include("poly.jl")
 #
 #include("show.jl")
 #
-#include("example1.jl")
-#include("example2.jl")
+include("example1.jl")
+include("example2.jl")