Changeset 13251

Timestamp:

11/18/15 13:55:01 (9 years ago)

Author:

mkommend

Message:

#2442: Adapted locking in the symbolic expression trees interpreters when incrementing the evaluated solutions.

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter

Files:

• SymbolicDataAnalysisExpressionCompiledTreeInterpreter.cs (modified) (1 diff)
• SymbolicDataAnalysisExpressionTreeILEmittingInterpreter.cs (modified) (1 diff)
• SymbolicDataAnalysisExpressionTreeInterpreter.cs (modified) (3 diffs)
• SymbolicDataAnalysisExpressionTreeLinearInterpreter.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionCompiledTreeInterpreter.cs

@@ -117 +117 @@
     public void ClearState() { }
 
+    private readonly object syncRoot = new object();
     public IEnumerable<double> GetSymbolicExpressionTreeValues(ISymbolicExpressionTree tree, IDataset dataset, IEnumerable<int> rows) {
       if (CheckExpressionsWithIntervalArithmetic)
         throw new NotSupportedException("Interval arithmetic is not yet supported in the symbolic data analysis interpreter.");
 
-      lock (EvaluatedSolutionsParameter.Value) {
+      lock (syncRoot) {
         EvaluatedSolutions++; // increment the evaluated solutions counter
       }

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeILEmittingInterpreter.cs

@@ -150 +150 @@
     #endregion
 
+    private readonly object syncRoot = new object();
     public IEnumerable<double> GetSymbolicExpressionTreeValues(ISymbolicExpressionTree tree, IDataset dataset, IEnumerable<int> rows) {
       if (CheckExpressionsWithIntervalArithmetic)
         throw new NotSupportedException("Interval arithmetic is not yet supported in the symbolic data analysis interpreter.");
 
-      EvaluatedSolutions++; // increment the evaluated solutions counter
+      lock (syncRoot) {
+        EvaluatedSolutions++; // increment the evaluated solutions counter
+      }
       var state = PrepareInterpreterState(tree, dataset);
 

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeInterpreter.cs

@@ -72 +72 @@
 
     protected SymbolicDataAnalysisExpressionTreeInterpreter(SymbolicDataAnalysisExpressionTreeInterpreter original,
-      Cloner cloner) : base(original, cloner) { }
+      Cloner cloner)
+      : base(original, cloner) { }
 
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -116 +117 @@
     #endregion
 
+    private readonly object syncRoot = new object();
     public IEnumerable<double> GetSymbolicExpressionTreeValues(ISymbolicExpressionTree tree, IDataset dataset,
       IEnumerable<int> rows) {
@@ -122 +124 @@
       }
 
-      lock (EvaluatedSolutionsParameter.Value) {
+      lock (syncRoot) {
         EvaluatedSolutions++; // increment the evaluated solutions counter
       }

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeLinearInterpreter.cs

@@ -123 +123 @@
     #endregion
 
+    private readonly object syncRoot = new object();
     public IEnumerable<double> GetSymbolicExpressionTreeValues(ISymbolicExpressionTree tree, IDataset dataset, IEnumerable<int> rows) {
       if (CheckExpressionsWithIntervalArithmetic)
         throw new NotSupportedException("Interval arithmetic is not yet supported in the symbolic data analysis interpreter.");
 
-      lock (EvaluatedSolutionsParameter.Value) {
+      lock (syncRoot) {
         EvaluatedSolutions++; // increment the evaluated solutions counter
       }