Add ExpressionTreeForge.extract_element_functions in parse-function.jl

src/parse-functions.jl

@@ -14,7 +14,7 @@ then try to detect the least squares pattern. There is no guarantee that this fu
 """
 function isnls(nlp)
   expr_tree = ExpressionTreeForge.get_expression_tree(nlp)
-  F_expr = extract_element_functions(expr_tree)
+  F_expr = ExpressionTreeForge.extract_element_functions(expr_tree)
   test_square(expr) = expr.field == ExpressionTreeForge.M_power_operator.Power_operator{Int}(2)
   is_nls = mapreduce(test_square, &, F_expr) :: Bool
   return is_nls 

test/parse-function-test.jl

@@ -1,18 +1,22 @@
 problems_names = meta[!,:name][1:50] # we test only the 50 first problems
 problems_symbols = map(name -> OptimizationProblems.ADNLPProblems.eval(Meta.parse(name)), problems_names)
 
-result_list_isnls = Bool[]
-@testset "Test NLS parser" for (index, problem) in enumerate(problems_symbols)
-  @debug "$index : $problem"
-  try
-    detect_nls = JSOSuite.isnls(problem())
-    is_nls = meta[meta.name .== problems_names[index], :objtype][1] == :least_squares
-    push!(result_list_isnls, detect_nls)
-    if detect_nls
-      @test detect_nls == is_nls
-      @debug "Least squares objective"
-    end
-  catch 
-    @debug "the $index-th $(problems_names[index]) problem is unsupported."
-  end 
+@testset "NLS from NLP" begin
+  result_list_isnls = Bool[]
+  for (index, problem) in enumerate(problems_symbols)
+    try
+      detect_nls = JSOSuite.isnls(problem())
+      is_nls = meta[meta.name .== problems_names[index], :objtype][1] == :least_squares
+      push!(result_list_isnls, detect_nls)
+      if detect_nls
+        @test detect_nls == is_nls
+        @debug "Least squares objective, $index : $problem"
+        # detect_nls != is_nls && (@debug "$index : $problem")
+      else 
+        @debug "Not least squares objective, $index : $problem"
+      end
+    catch 
+      @debug "the $index-th $(problems_names[index]) problem is unsupported."
+    end 
+  end
 end