Added FB

Author: albop

src/Dolang.jl

@@ -1,4 +1,4 @@
-__precompile__(true)
+# __precompile__(true)
 module Dolang
 
 using DataStructures

src/grammar.jl

@@ -2,20 +2,38 @@ using Lerche
 
 grammar_path = joinpath(dirname(pathof(@__MODULE__)), "grammar.lark")
 
+
+println(grammar_path)
 txt = read(open(grammar_path), String)
-const parser = Lark(txt, 
+# const parser = Lark(txt, 
+#     parser="lalr", start="formula");
+
+# const parser_equation = Lark(txt, 
+#     parser="lalr", start="equation");
+
+# const parser_assignment = Lark(txt, 
+#     parser="lalr", start="assignment");
+
+# const parser_equation_block = Lark(txt, 
+#     parser="lalr", start="equation_block");
+
+# const parser_assignment_block = Lark(txt, 
+#     parser="lalr", start="assignment_block");
+
+
+ parser = Lark(txt, 
     parser="lalr", start="formula");
 
-const parser_equation = Lark(txt, 
+ parser_equation = Lark(txt, 
     parser="lalr", start="equation");
 
-const parser_assignment = Lark(txt, 
+ parser_assignment = Lark(txt, 
     parser="lalr", start="assignment");
 
-    const parser_equation_block = Lark(txt, 
+ parser_equation_block = Lark(txt, 
     parser="lalr", start="equation_block");
 
-const parser_assignment_block = Lark(txt, 
+ parser_assignment_block = Lark(txt, 
     parser="lalr", start="assignment_block");
 
 
@@ -121,6 +139,7 @@ end
 end
 
 @rule call(t::Converter, children) =  Expr(:call, Symbol(children[1].value), children[2:end]...)
+@rule calltwo(t::Converter, children) =  Expr(:call, Symbol(children[1].value), children[2:end]...)
 @rule add(t::Converter, children) =  Expr(:call, :+, children...)
 @rule mul(t::Converter, children) =  Expr(:call, :*, children...)
 @rule div(t::Converter, children) =  Expr(:call, :/, children...)

src/grammar.lark

@@ -36,6 +36,7 @@ _POW: "^"|"**"
 ?atom: NUMBER           -> number
     | "-" atom         -> neg
     | pow
+    | calltwo
     | call
     | "(" formula ")"
     | symbol       
@@ -52,10 +53,13 @@ subperiod: INT | NAME
 !cname: NAME -> name
 ?date_index: "t" SIGNED_INT2 -> date
     | SIGNED_INT -> date
-?call: FUNCTION "(" sum ")" -> call
 
+?call: FUNCTION "(" sum ")" -> call
 // this is to help the lark version
-FUNCTION.2: "sin"|"cos"|"exp"|"log"
+FUNCTION.2: "sin"|"cos"|"exp"|"log"|"nep"
+
+?calltwo: FUNCTIONTWO "(" sum "," sum ")" -> calltwo
+FUNCTIONTWO.2: "FB"|"min"|"max"
 
 SIGNED_INT2: ("+"|"-") INT
 

test/compiler_new.jl

@@ -20,7 +20,30 @@ ff = Dolang.FunctionFactory(eqs, args, params, targets=targets, defs=defs,
 
 ff2 = Dolang.FunctionFactory(eqs, grouped_args, params, targets=targets, defs=defs,
                             funname=funname)
-
+                            using Dolo
+                            using DoloYAML
+                            import DoloYAML: orphan
+                            using TimerOutputs
+                            
+                            import Dolo: initial_guess
+                            
+                            const NT = Threads.nthreads()
+                            
+                            if NT > 1
+                                # use multithreading library KernelAbstractions
+                                engine = :cpu
+                            else
+                                # only one CPU
+                                engine = nothing
+                            end
+                            
+                            println("Running simulations with $NT threads.")
+                            
+                            include("implementations.jl")
+                            
+                            model = DoloYAML.yaml_import("models/consumption_savings_new.yaml")
+                            dmodel = Dolo.discretize(model)
+                            
 
 # we're all static arrays
 x = @SVector [1.0]

tests/test_parsing.jl

@@ -1,19 +1,34 @@
-import YAML
-
-doc = YAML.load_file("tests/tests.yaml")
-
-summary = []
-
-for ex in doc["expressions"]
-    result = try
-        Meta.parse(ex)
-        "OK"
-    catch
-        "Failed"
-    end
-    push!(summary, (ex, result))
-    println(ex, " : ", result)
-end
+a = 9
+
+using Dolang
+
+eq = Dolang.parse_equation("fb(a[t];b[t])")
+
+
+# eq = Dolang.parse_equation("a[t]-b[t]")
+
+Dolang.convert(Expr,eq)
+
+
+# Dolang.parse_equation("∀t, t>9");
+
+
+# import YAML
+
+# doc = YAML.load_file("tests/tests.yaml")
+
+# summary = []
+
+# for ex in doc["expressions"]
+#     result = try
+#         Meta.parse(ex)
+#         "OK"
+#     catch
+#         "Failed"
+#     end
+#     push!(summary, (ex, result))
+#     println(ex, " : ", result)
+# end
 
 # for ex in doc["symbols"]
 #     result = try