Merge pull request #133 from biaslab/128-meta-engine-is-still-based-o…

…n-faulty-old-constraints-architecture

128 meta engine is still based on faulty old constraints architecture

.JuliaFormatter.toml

@@ -0,0 +1,26 @@
+style = "blue"
+indent = 4
+margin = 180
+always_for_in = true
+whitespace_typedefs = true
+whitespace_ops_in_indices = true
+remove_extra_newlines = true
+import_to_using = false
+pipe_to_function_call = false
+short_to_long_function_def = false 
+long_to_short_function_def = false
+always_use_return = false
+whitespace_in_kwargs = true
+annotate_untyped_fields_with_any = false 
+format_docstrings = false
+conditional_to_if = true
+trailing_comma = false
+indent_submodule = false
+align_assignment = true
+align_struct_field = true
+align_conditional = true
+align_pair_arrow = true
+align_matrix = false
+join_lines_based_on_source = false
+separate_kwargs_with_semicolon = false
+surround_whereop_typeparameters = true

Project.toml

@@ -27,7 +27,12 @@ GraphPPLPlottingExt = ["Cairo", "Compose", "GraphPlot"]
 
 [compat]
 BitSetTuples = "1"
+Cairo = "1.0"
+Compose = "0.9"
 DataStructures = "0.18"
+Distributions = "0.25"
+Documenter = "1.0"
+GraphPlot = "0.5"
 MacroTools = "0.5.6"
 Memoization = "0.2"
 MetaGraphsNext = "0.6"

scripts/format.jl

@@ -13,12 +13,7 @@ commandline_args = parse_args(s)
 folders_to_format = ["scripts", "src", "test"]
 
 overwrite = commandline_args["overwrite"]
-formatted = all(
-    map(
-        folder -> JuliaFormatter.format(folder, overwrite = overwrite, verbose = true),
-        folders_to_format,
-    ),
-)
+formatted = all(map(folder -> JuliaFormatter.format(folder, overwrite = overwrite, verbose = true), folders_to_format))
 
 if !formatted && !overwrite
     @error "JuliaFormatter lint has failed. Run `make format` from `GraphPPL.jl` main directory and commit your changes to fix code style."

src/GraphPPL.jl

@@ -11,5 +11,4 @@ include("constraints_macro.jl")
 include("meta_engine.jl")
 include("meta_macro.jl")
 
-
 end # module

src/constraints_macro.jl

@@ -2,13 +2,8 @@ export @constraints
 using MacroTools
 
 function check_reserved_variable_names_constraints(e::Expr)
-    if any(
-        reserved_name -> MacroTools.inexpr(e, reserved_name),
-        [:(__constraints__), :(__outer_constraints__)],
-    )
-        error(
-            "Variable name in $(prettify(e)) cannot be used as it is a reserved variable name in the model macro.",
-        )
+    if any(reserved_name -> MacroTools.inexpr(e, reserved_name), [:(__constraints__), :(__outer_constraints__)])
+        error("Variable name in $(prettify(e)) cannot be used as it is a reserved variable name in the model macro.")
     end
     return e
 end
@@ -30,8 +25,7 @@ function create_submodel_constraints(e::Expr)
         end
     ))
         if @capture(submodel, (name_, index_))
-            submodel_constructor =
-                :(GraphPPL.SpecificSubModelConstraints(GraphPPL.FactorID($name, $index)))
+            submodel_constructor = :(GraphPPL.SpecificSubModelConstraints(GraphPPL.FactorID($name, $index)))
         else
             submodel_constructor = :(GraphPPL.GeneralSubModelConstraints($submodel))
         end
@@ -64,8 +58,7 @@ function create_factorization_combinedrange(e::Expr)
     return e
 end
 
-__convert_to_indexed_statement(e::Symbol) =
-    :(GraphPPL.IndexedVariable($(QuoteNode(e)), nothing))
+__convert_to_indexed_statement(e::Symbol) = :(GraphPPL.IndexedVariable($(QuoteNode(e)), nothing))
 function __convert_to_indexed_statement(e::Expr)
     if @capture(e, (var_[index_]))
         return :(GraphPPL.IndexedVariable($(QuoteNode(var)), $index))
@@ -97,10 +90,7 @@ function convert_functionalform_constraints(e::Expr)
         end
     elseif @capture(e, (q(vars__)::T_))
         return quote
-            push!(
-                __constraints__,
-                GraphPPL.FunctionalFormConstraint($(Expr(:tuple, vars...)), $T),
-            )
+            push!(__constraints__, GraphPPL.FunctionalFormConstraint($(Expr(:tuple, vars...)), $T))
         end
     else
         return e
@@ -130,17 +120,12 @@ function convert_factorization_constraints(e::Expr)
             return expr
         end
         return quote
-            push!(
-                __constraints__,
-                GraphPPL.FactorizationConstraint($(Expr(:tuple, lhs...)), $rhs),
-            )
+            push!(__constraints__, GraphPPL.FactorizationConstraint($(Expr(:tuple, lhs...)), $rhs))
         end
     end
     return e
 end
 
-
-
 function constraints_macro_interior(cs_body::Expr)
     cs_body = apply_pipeline(cs_body, check_for_returns_constraints)
     cs_body = add_constraints_construction(cs_body)