Skip to content

Verification_Engine: CSharpScript.EvaluateAsync fixed to only generate one assembly per formula #3494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 2, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 32 additions & 2 deletions Verification_Engine/Compute/VerifyCondition.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
using BH.oM.Verification.Conditions;
using BH.oM.Verification.Results;
using Microsoft.CodeAnalysis.CSharp.Scripting;
using Microsoft.CodeAnalysis.Scripting;
using System;
using System.Collections.Generic;
using System.ComponentModel;
Expand Down Expand Up @@ -558,9 +559,9 @@ private static object Solve(this Formula formula, object obj, Dictionary<string,
formulaToSolve = formulaToSolve.Replace(key, stringReplacements[key]);
}

return CSharpScript.EvaluateAsync(formulaToSolve, globals: globals).Result;
return Evaluate(formulaToSolve, globals);
}
catch
catch (Exception ex)
{
BH.Engine.Base.Compute.RecordError($"Formula {formula.Equation} could not be solved, please make sure it does not contain errors.");
return null;
Expand Down Expand Up @@ -691,6 +692,35 @@ private static string IntroduceTolerance(this string equation, ValueComparisonTy
}

/***************************************************/

private static object Evaluate(string formula, object globals)
{
return CompileScript(formula, globals.GetType()).RunAsync(globals: globals).Result.ReturnValue;
}

/***************************************************/

private static Script CompileScript(string formula, Type globalsType)
{
(string, Type) key = (formula, globalsType);
Script result;
if (!m_CompiledScripts.TryGetValue(key, out result))
{
result = CSharpScript.Create(formula, globalsType: globalsType);
m_CompiledScripts.Add(key, result);
}

return result;
}


/***************************************************/
/**** Private Fields ****/
/***************************************************/

private static Dictionary<(string, Type), Script> m_CompiledScripts = new Dictionary<(string, Type), Script>();

/***************************************************/
}
}