- Timestamp:
- 10/18/18 14:07:32 (6 years ago)
- Location:
- branches/2931_OR-Tools_LP_MIP
- Files:
-
- 4 edited
- 2 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/2931_OR-Tools_LP_MIP
- Property svn:mergeinfo changed
/branches/2916_IndexedDataTableSerialization (added) merged: 15918 /trunk merged: 16168-16169,16177,16179,16184-16187,16202-16209,16211,16213,16216,16218-16219,16221,16223-16224,16232
- Property svn:mergeinfo changed
-
branches/2931_OR-Tools_LP_MIP/HeuristicLab.Problems.DataAnalysis.Symbolic
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Problems.DataAnalysis.Symbolic merged: 16206,16213,16216,16218
- Property svn:mergeinfo changed
-
branches/2931_OR-Tools_LP_MIP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/TreeSimplifier.cs
r15583 r16235 1121 1121 // $ * 1.0 => $ 1122 1122 return a; 1123 } else if (IsConstant(b) && ((ConstantTreeNode)b).Value.IsAlmost(0.0)) { 1124 return MakeConstant(0); 1123 1125 } else if (IsConstant(b) && IsVariableBase(a)) { 1124 1126 // multiply constants into variables weights -
branches/2931_OR-Tools_LP_MIP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj
r16070 r16235 139 139 <Compile Include="Converters\LinearModelToTreeConverter.cs" /> 140 140 <Compile Include="Converters\TreeSimplifier.cs" /> 141 <Compile Include="Converters\DerivativeCalculator.cs" /> 141 142 <Compile Include="Converters\TreeToAutoDiffTermConverter.cs" /> 142 143 <Compile Include="Formatters\InfixExpressionFormatter.cs" /> … … 144 145 <Compile Include="Formatters\SymbolicDataAnalysisExpressionMathematicaFormatter.cs" /> 145 146 <Compile Include="Formatters\SymbolicDataAnalysisExpressionCSharpFormatter.cs" /> 147 <Compile Include="Hashing\HashExtensions.cs" /> 148 <Compile Include="Hashing\HashUtil.cs" /> 149 <Compile Include="Hashing\SymbolicExpressionTreeHash.cs" /> 146 150 <Compile Include="Importer\InfixExpressionParser.cs" /> 147 151 <Compile Include="Importer\SymbolicExpressionImporter.cs" />
Note: See TracChangeset
for help on using the changeset viewer.