Changeset 17628 for branches/3073_IA_constraint_splitting
- Timestamp:
- 06/23/20 13:23:40 (5 years ago)
- Location:
- branches/3073_IA_constraint_splitting/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4
- Files:
-
- 1 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3073_IA_constraint_splitting/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj
r17590 r17628 224 224 <Compile Include="Formatters\SymbolicDataAnalysisExpressionCSharpFormatter.cs" /> 225 225 <Compile Include="Grammars\DataAnalysisGrammar.cs" /> 226 <Compile Include="Grammars\IntervalArithmeticGrammar.cs" /> 226 227 <Compile Include="Hashing\HashExtensions.cs" /> 227 228 <Compile Include="Hashing\HashUtil.cs" /> -
branches/3073_IA_constraint_splitting/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/IntervalInterpreter.cs
r17579 r17628 37 37 private const string EvaluatedSolutionsParameterName = "EvaluatedSolutions"; 38 38 39 public IFixedValueParameter<IntValue> EvaluatedSolutionsParameter { 40 get { return (IFixedValueParameter<IntValue>)Parameters[EvaluatedSolutionsParameterName]; } 41 } 39 public IFixedValueParameter<IntValue> EvaluatedSolutionsParameter => (IFixedValueParameter<IntValue>)Parameters[EvaluatedSolutionsParameterName]; 42 40 43 41 public int EvaluatedSolutions { 44 get { return EvaluatedSolutionsParameter.Value.Value; }45 set { EvaluatedSolutionsParameter.Value.Value = value; }42 get => EvaluatedSolutionsParameter.Value.Value; 43 set => EvaluatedSolutionsParameter.Value.Value = value; 46 44 } 47 45 … … 89 87 90 88 // because of numerical errors the bounds might be incorrect 91 if (outputInterval.LowerBound <= outputInterval.UpperBound) 92 return outputInterval; 93 else 94 return new Interval(outputInterval.UpperBound, outputInterval.LowerBound); 89 return outputInterval.LowerBound <= outputInterval.UpperBound ? outputInterval : new Interval(outputInterval.UpperBound, outputInterval.LowerBound); 95 90 } 96 91 … … 279 274 280 275 public static bool IsCompatible(ISymbolicExpressionTree tree) { 281 var containsUnknownSy umbol= (276 var containsUnknownSymbols = ( 282 277 from n in tree.Root.GetSubtree(0).IterateNodesPrefix() 283 278 where … … 301 296 !(n.Symbol is AnalyticQuotient) 302 297 select n).Any(); 303 return !containsUnknownSy umbol;298 return !containsUnknownSymbols; 304 299 } 305 300 }
Note: See TracChangeset
for help on using the changeset viewer.