added support for variables and parameters as array. also improved conversion of variables and parameters into Expressionelement

package/test/CpuInterpreterTests.jl

@@ -45,10 +45,10 @@ end
 
 # LinearAlgebra.BLAS.set_num_threads(1) # only use a single thread for peakflops
 
-@test test_cpu_interpreter(1000)
-@test test_cpu_interpreter(1000, parallel=true) # start julia -t 6 for six threads
-@test test_cpu_interpreter(10000)
-@test test_cpu_interpreter(10000, parallel=true)
+# @test test_cpu_interpreter(1000)
+# @test test_cpu_interpreter(1000, parallel=true) # start julia -t 6 for six threads
+# @test test_cpu_interpreter(10000)
+# @test test_cpu_interpreter(10000, parallel=true)
 
 
 function test_cpu_interpreter_nikuradse() 
@@ -62,14 +62,25 @@ function test_cpu_interpreter_nikuradse()
     # data/esr_nvar2_len10.txt.gz_9.txt.gz has  ~250_000 exprs
     # data/esr_nvar2_len10.txt.gz_10.txt.gz has ~800_000 exrps
     GZip.open("data/esr_nvar2_len10.txt.gz_9.txt.gz") do io 
+		i = 0
         for line in eachline(io)
             expr, p = parse_infix(line, varnames, paramnames)
             
+			if i > 10
+				return
+			end
+			println(expr)
+
             push!(exprs, expr)
             push!(parameters, randn(Float32, length(p)))
+
+			i += 1
         end
     end
     
     
     interpret_cpu(exprs, X, parameters) # TODO: sufficient to do up to 10 repetitions per expression, 
-end
+end
+
+
+@test test_cpu_interpreter_nikuradse()

package/test/ExpressionProcessingTests.jl

@@ -1,35 +1,30 @@
 using .ExpressionProcessing
 
-expressions = Vector{Expr}(undef, 1)
-variables = Matrix{Float32}(undef, 1,2)
-parameters = Vector{Vector{Float32}}(undef, 1)
+expressions = Vector{Expr}(undef, 2)
 
-# Resulting value should be 10
 expressions[1] = :(x1 + 1 * x2 + p1)
-variables[1,1] = 2
-variables[1,2] = 3
-parameters[1] = Vector{Float32}(undef, 1)
-parameters[1][1] = 5
+expressions[2] = :(x[1] + 1 * x[2] + p[1])
 
 @testset "Test conversion expression element" begin
 	reference1 = ExpressionElement(FLOAT32, reinterpret(Int32, 1f0))
-	reference2 = ExpressionElement(INDEX, reinterpret(Int32, Int32(1)))
+	reference2 = ExpressionElement(VARIABLE, Int32(1))
 	reference3 = ExpressionElement(OPERATOR, reinterpret(Int32, ADD))
 	
 	@test isequal(reference1, ExpressionProcessing.convert_to_ExpressionElement(1.0))
-	@test isequal(reference2, ExpressionProcessing.convert_to_ExpressionElement(1))
+	@test isequal(reference2, ExpressionProcessing.convert_to_ExpressionElement(:x1))
 	@test isequal(reference3, ExpressionProcessing.convert_to_ExpressionElement(ADD))
 end
 
 @testset "Test conversion to postfix" begin
 	reference = PostfixType()
 
-	append!(reference, [ExpressionProcessing.convert_to_ExpressionElement(1), ExpressionProcessing.convert_to_ExpressionElement(1.0), ExpressionProcessing.convert_to_ExpressionElement(2), ExpressionProcessing.convert_to_ExpressionElement(MULTIPLY), 
-	ExpressionProcessing.convert_to_ExpressionElement(ADD), ExpressionProcessing.convert_to_ExpressionElement(-1), ExpressionProcessing.convert_to_ExpressionElement(ADD)])
-	cache = Dict{Expr, PostfixType}()
-	postfix = expr_to_postfix(expressions[1], cache)
+	append!(reference, [ExpressionProcessing.convert_to_ExpressionElement(:x1), ExpressionProcessing.convert_to_ExpressionElement(1.0), ExpressionProcessing.convert_to_ExpressionElement(:x2), ExpressionProcessing.convert_to_ExpressionElement(MULTIPLY), 
+	ExpressionProcessing.convert_to_ExpressionElement(ADD), ExpressionProcessing.convert_to_ExpressionElement(:p1), ExpressionProcessing.convert_to_ExpressionElement(ADD)])
+	postfixVarsAsSymbol = expr_to_postfix(expressions[1], Dict{Expr, PostfixType}())
+	postfixVarsAsArray = expr_to_postfix(expressions[2], Dict{Expr, PostfixType}())
 
-	@test isequal(reference, postfix)
+	@test isequal(reference, postfixVarsAsSymbol)
+	@test isequal(reference, postfixVarsAsArray)
 
 	# TODO: Do more complex expressions because these have led to errors in the past
 end

package/test/Project.toml

@@ -2,6 +2,8 @@
 BenchmarkPlots = "ab8c0f59-4072-4e0d-8f91-a91e1495eb26"
 BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
 CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
+DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab"
+GZip = "92fee26a-97fe-5a0c-ad85-20a5f3185b63"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 StatsPlots = "f3b207a7-027a-5e70-b257-86293d7955fd"

package/test/runtests.jl

@@ -16,9 +16,9 @@ include(joinpath(baseFolder, "src", "Transpiler.jl"))
 end
 
 
-# @testset "CPU Interpreter" begin
-# 	include("CpuInterpreterTests.jl")
-# end
+@testset "CPU Interpreter" begin
+	# include("CpuInterpreterTests.jl")
+end
 
 @testset "Performance tests" begin
 	# include("PerformanceTuning.jl")