Changeset 16654

Timestamp:

03/07/19 12:29:27 (6 years ago)

Author:

gkronber

Message:

#2866: merged r16364:16653 from trunk to branch to prepare for trunk reintegration (resolving conflicts in the project file)

Location:

branches/2866_SymRegHyperbolicFunctions/HeuristicLab.Problems.DataAnalysis.Symbolic

Files:

• . (modified) (view diffs)
• 3.4/Analyzers/SymbolicDataAnalysisAlleleFrequencyAnalyzer.cs (modified) (view diffs)
• 3.4/Analyzers/SymbolicDataAnalysisAnalyzer.cs (modified) (view diffs)
• 3.4/Analyzers/SymbolicDataAnalysisBottomUpDiversityAnalyzer.cs (modified) (view diffs)
• 3.4/Analyzers/SymbolicDataAnalysisBuildingBlockAnalyzer.cs (modified) (view diffs)
• 3.4/Analyzers/SymbolicDataAnalysisMultiObjectiveAnalyzer.cs (modified) (view diffs)
• 3.4/Analyzers/SymbolicDataAnalysisMultiObjectiveTrainingBestSolutionAnalyzer.cs (modified) (view diffs)
• 3.4/Analyzers/SymbolicDataAnalysisMultiObjectiveValidationAnalyzer.cs (modified) (view diffs)
• 3.4/Analyzers/SymbolicDataAnalysisMultiObjectiveValidationBestSolutionAnalyzer.cs (modified) (view diffs)
• 3.4/Analyzers/SymbolicDataAnalysisSingleObjectiveAnalyzer.cs (modified) (view diffs)
• 3.4/Analyzers/SymbolicDataAnalysisSingleObjectivePruningAnalyzer.cs (modified) (view diffs)
• 3.4/Analyzers/SymbolicDataAnalysisSingleObjectiveTrainingBestSolutionAnalyzer.cs (modified) (view diffs)
• 3.4/Analyzers/SymbolicDataAnalysisSingleObjectiveTrainingParetoBestSolutionAnalyzer.cs (modified) (view diffs)
• 3.4/Analyzers/SymbolicDataAnalysisSingleObjectiveValidationAnalyzer.cs (modified) (view diffs)
• 3.4/Analyzers/SymbolicDataAnalysisSingleObjectiveValidationBestSolutionAnalyzer.cs (modified) (view diffs)
• 3.4/Analyzers/SymbolicDataAnalysisSingleObjectiveValidationParetoBestSolutionAnalyzer.cs (modified) (view diffs)
• 3.4/Analyzers/SymbolicDataAnalysisVariableFrequencyAnalyzer.cs (modified) (view diffs)
• 3.4/Converters/DerivativeCalculator.cs (modified) (view diffs)
• 3.4/Converters/LinearModelToTreeConverter.cs (modified) (view diffs)
• 3.4/Converters/TreeSimplifier.cs (modified) (view diffs)
• 3.4/Converters/TreeToAutoDiffTermConverter.cs (modified) (view diffs)
• 3.4/Creators/MultiSymbolicDataAnalysisExpressionCreator.cs (modified) (view diffs)
• 3.4/Creators/SymbolicDataAnalysisExpressionFullTreeCreator.cs (modified) (view diffs)
• 3.4/Creators/SymbolicDataAnalysisExpressionGrowTreeCreator.cs (modified) (view diffs)
• 3.4/Creators/SymbolicDataAnalysisExpressionRampedHalfAndHalfTreeCreator.cs (modified) (view diffs)
• 3.4/Creators/SymbolicDataAnalysisExpressionTreeCreator.cs (modified) (view diffs)
• 3.4/Crossovers/MultiSymbolicDataAnalysisExpressionCrossover.cs (modified) (view diffs)
• 3.4/Crossovers/SymbolicDataAnalysisExpressionContextAwareCrossover.cs (modified) (view diffs)
• 3.4/Crossovers/SymbolicDataAnalysisExpressionCrossover.cs (modified) (view diffs)
• 3.4/Crossovers/SymbolicDataAnalysisExpressionDepthConstrainedCrossover.cs (modified) (view diffs)
• 3.4/Crossovers/SymbolicDataAnalysisExpressionDeterministicBestCrossover.cs (modified) (view diffs)
• 3.4/Crossovers/SymbolicDataAnalysisExpressionDiversityPreservingCrossover.cs (modified) (view diffs)
• 3.4/Crossovers/SymbolicDataAnalysisExpressionProbabilisticFunctionalCrossover.cs (modified) (view diffs)
• 3.4/Crossovers/SymbolicDataAnalysisExpressionSemanticSimilarityCrossover.cs (modified) (view diffs)
• 3.4/Evaluators/SymbolicDataAnalysisEvaluator.cs (modified) (view diffs)
• 3.4/Evaluators/SymbolicDataAnalysisMultiObjectiveEvaluator.cs (modified) (view diffs)
• 3.4/Evaluators/SymbolicDataAnalysisSingleObjectiveEvaluator.cs (modified) (view diffs)
• 3.4/Formatters/InfixExpressionFormatter.cs (modified) (view diffs)
• 3.4/Formatters/SymbolicDataAnalysisExpressionCSharpFormatter.cs (modified) (view diffs)
• 3.4/Formatters/SymbolicDataAnalysisExpressionExcelFormatter.cs (modified) (view diffs)
• 3.4/Formatters/SymbolicDataAnalysisExpressionLatexFormatter.cs (modified) (view diffs)
• 3.4/Formatters/SymbolicDataAnalysisExpressionMATLABFormatter.cs (modified) (view diffs)
• 3.4/Formatters/SymbolicDataAnalysisExpressionMathematicaFormatter.cs (modified) (view diffs)
• 3.4/Formatters/SymbolicDataAnalysisExpressionSmalltalkFormatter.cs (modified) (view diffs)
• 3.4/Formatters/TSQLExpressionFormatter.cs (modified) (view diffs)
• 3.4/Grammars/ArithmeticExpressionGrammar.cs (modified) (view diffs)
• 3.4/Grammars/FullFunctionalExpressionGrammar.cs (modified) (view diffs)
• 3.4/Grammars/TypeCoherentExpressionGrammar.cs (modified) (view diffs)
• 3.4/Hashing/HashExtensions.cs (modified) (view diffs)
• 3.4/Hashing/HashUtil.cs (modified) (view diffs)
• 3.4/Hashing/SymbolicExpressionTreeHash.cs (modified) (view diffs)
• 3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj (modified) (view diffs)
• 3.4/Importer/InfixExpressionParser.cs (modified) (view diffs)
• 3.4/Importer/SymbolicExpressionImporter.cs (modified) (view diffs)
• 3.4/Importer/Token.cs (modified) (view diffs)
• 3.4/Interfaces/IModelBacktransformator.cs (modified) (view diffs)
• 3.4/Interfaces/ISymbolicDataAnalysisAnalyzer.cs (modified) (view diffs)
• 3.4/Interfaces/ISymbolicDataAnalysisBoundedOperator.cs (modified) (view diffs)
• 3.4/Interfaces/ISymbolicDataAnalysisEvaluator.cs (modified) (view diffs)
• 3.4/Interfaces/ISymbolicDataAnalysisExpressionCrossover.cs (modified) (view diffs)
• 3.4/Interfaces/ISymbolicDataAnalysisExpressionTreeInterpreter.cs (modified) (view diffs)
• 3.4/Interfaces/ISymbolicDataAnalysisGrammar.cs (modified) (view diffs)
• 3.4/Interfaces/ISymbolicDataAnalysisImpactValuesCalculator.cs (modified) (view diffs)
• 3.4/Interfaces/ISymbolicDataAnalysisInterpreterOperator.cs (modified) (view diffs)
• 3.4/Interfaces/ISymbolicDataAnalysisModel.cs (modified) (view diffs)
• 3.4/Interfaces/ISymbolicDataAnalysisMultiObjectiveAnalyzer.cs (modified) (view diffs)
• 3.4/Interfaces/ISymbolicDataAnalysisMultiObjectiveEvaluator.cs (modified) (view diffs)
• 3.4/Interfaces/ISymbolicDataAnalysisProblem.cs (modified) (view diffs)
• 3.4/Interfaces/ISymbolicDataAnalysisSingleObjectiveAnalyzer.cs (modified) (view diffs)
• 3.4/Interfaces/ISymbolicDataAnalysisSingleObjectiveEvaluator.cs (modified) (view diffs)
• 3.4/Interfaces/ISymbolicDataAnalysisSolution.cs (modified) (view diffs)
• 3.4/Interfaces/ISymbolicDataAnalysisSolutionCreator.cs (modified) (view diffs)
• 3.4/Interfaces/ISymbolicDataAnalysisValidationAnalyzer.cs (modified) (view diffs)
• 3.4/Interfaces/IVariableSymbol.cs (modified) (view diffs)
• 3.4/Interfaces/IVariableTreeNode.cs (modified) (view diffs)
• 3.4/Interpreter/InterpreterState.cs (modified) (view diffs)
• 3.4/Interpreter/IntervalInterpreter.cs (copied) (copied from trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/IntervalInterpreter.cs) (view diffs)
• 3.4/Interpreter/OpCodes.cs (modified) (view diffs)
• 3.4/Interpreter/SymbolicDataAnalysisExpressionCompiledTreeInterpreter.cs (modified) (view diffs)
• 3.4/Interpreter/SymbolicDataAnalysisExpressionTreeBatchInterpreter.cs (modified) (view diffs)
• 3.4/Interpreter/SymbolicDataAnalysisExpressionTreeILEmittingInterpreter.cs (modified) (view diffs)
• 3.4/Interpreter/SymbolicDataAnalysisExpressionTreeInterpreter.cs (modified) (view diffs)
• 3.4/Interpreter/SymbolicDataAnalysisExpressionTreeLinearInterpreter.cs (modified) (view diffs)
• 3.4/Interpreter/SymbolicDataAnalysisExpressionTreeNativeInterpreter.cs (modified) (view diffs)
• 3.4/Plugin.cs.frame (modified) (view diffs)
• 3.4/Properties/AssemblyInfo.cs.frame (modified) (view diffs)
• 3.4/Selectors (copied) (copied from trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Selectors) (view diffs)
• 3.4/SymbolicDataAnalysisExpressionPruningOperator.cs (modified) (view diffs)
• 3.4/SymbolicDataAnalysisExpressionTreeSimplificationOperator.cs (modified) (view diffs)
• 3.4/SymbolicDataAnalysisModel.cs (modified) (view diffs)
• 3.4/SymbolicDataAnalysisModelComplexityCalculator.cs (modified) (view diffs)
• 3.4/SymbolicDataAnalysisMultiObjectiveProblem.cs (modified) (view diffs)
• 3.4/SymbolicDataAnalysisProblem.cs (modified) (view diffs)
• 3.4/SymbolicDataAnalysisSingleObjectiveProblem.cs (modified) (view diffs)
• 3.4/SymbolicDataAnalysisSolutionImpactValuesCalculator.cs (modified) (view diffs)
• 3.4/Symbols/Absolute.cs (modified) (view diffs)
• 3.4/Symbols/Addition.cs (modified) (view diffs)
• 3.4/Symbols/AiryA.cs (modified) (view diffs)
• 3.4/Symbols/AiryB.cs (modified) (view diffs)
• 3.4/Symbols/AnalyticQuotient.cs (modified) (view diffs)
• 3.4/Symbols/And.cs (modified) (view diffs)
• 3.4/Symbols/AutoregressiveVariable.cs (modified) (view diffs)
• 3.4/Symbols/Average.cs (modified) (view diffs)
• 3.4/Symbols/Bessel.cs (modified) (view diffs)
• 3.4/Symbols/BinaryFactorVariable.cs (modified) (view diffs)
• 3.4/Symbols/BinaryFactorVariableTreeNode.cs (modified) (view diffs)
• 3.4/Symbols/Constant.cs (modified) (view diffs)
• 3.4/Symbols/ConstantTreeNode.cs (modified) (view diffs)
• 3.4/Symbols/Cosine.cs (modified) (view diffs)
• 3.4/Symbols/CosineIntegral.cs (modified) (view diffs)
• 3.4/Symbols/Cube.cs (modified) (view diffs)
• 3.4/Symbols/CubeRoot.cs (modified) (view diffs)
• 3.4/Symbols/Dawson.cs (modified) (view diffs)
• 3.4/Symbols/Derivative.cs (modified) (view diffs)
• 3.4/Symbols/Division.cs (modified) (view diffs)
• 3.4/Symbols/Erf.cs (modified) (view diffs)
• 3.4/Symbols/Exponential.cs (modified) (view diffs)
• 3.4/Symbols/ExponentialIntegralEi.cs (modified) (view diffs)
• 3.4/Symbols/FactorVariable.cs (modified) (view diffs)
• 3.4/Symbols/FactorVariableTreeNode.cs (modified) (view diffs)
• 3.4/Symbols/FresnelCosineIntegral.cs (modified) (view diffs)
• 3.4/Symbols/FresnelSineIntegral.cs (modified) (view diffs)
• 3.4/Symbols/Gamma.cs (modified) (view diffs)
• 3.4/Symbols/GreaterThan.cs (modified) (view diffs)
• 3.4/Symbols/HyperbolicCosineIntegral.cs (modified) (view diffs)
• 3.4/Symbols/HyperbolicSineIntegral.cs (modified) (view diffs)
• 3.4/Symbols/ILaggedTreeNode.cs (modified) (view diffs)
• 3.4/Symbols/IfThenElse.cs (modified) (view diffs)
• 3.4/Symbols/Integral.cs (modified) (view diffs)
• 3.4/Symbols/LaggedSymbol.cs (modified) (view diffs)
• 3.4/Symbols/LaggedTreeNode.cs (modified) (view diffs)
• 3.4/Symbols/LaggedVariable.cs (modified) (view diffs)
• 3.4/Symbols/LaggedVariableTreeNode.cs (modified) (view diffs)
• 3.4/Symbols/LessThan.cs (modified) (view diffs)
• 3.4/Symbols/Logarithm.cs (modified) (view diffs)
• 3.4/Symbols/Multiplication.cs (modified) (view diffs)
• 3.4/Symbols/Norm.cs (modified) (view diffs)
• 3.4/Symbols/Not.cs (modified) (view diffs)
• 3.4/Symbols/Or.cs (modified) (view diffs)
• 3.4/Symbols/Power.cs (modified) (view diffs)
• 3.4/Symbols/Psi.cs (modified) (view diffs)
• 3.4/Symbols/Root.cs (modified) (view diffs)
• 3.4/Symbols/Sine.cs (modified) (view diffs)
• 3.4/Symbols/SineIntegral.cs (modified) (view diffs)
• 3.4/Symbols/Square.cs (modified) (view diffs)
• 3.4/Symbols/SquareRoot.cs (modified) (view diffs)
• 3.4/Symbols/Subtraction.cs (modified) (view diffs)
• 3.4/Symbols/Tangent.cs (modified) (view diffs)
• 3.4/Symbols/TimeLag.cs (modified) (view diffs)
• 3.4/Symbols/Variable.cs (modified) (view diffs)
• 3.4/Symbols/VariableBase.cs (modified) (view diffs)
• 3.4/Symbols/VariableCondition.cs (modified) (view diffs)
• 3.4/Symbols/VariableConditionTreeNode.cs (modified) (view diffs)
• 3.4/Symbols/VariableTreeNode.cs (modified) (view diffs)
• 3.4/Symbols/VariableTreeNodeBase.cs (modified) (view diffs)
• 3.4/Symbols/Xor.cs (modified) (view diffs)
• 3.4/Transformations/SymbolicExpressionTreeBacktransformator.cs (modified) (view diffs)
• 3.4/Transformations/TransformationToSymbolicTreeMapper.cs (modified) (view diffs)
• 3.4/TreeMatching/SymbolicExpressionTreeBottomUpSimilarityCalculator.cs (modified) (view diffs)
• 3.4/TreeMatching/SymbolicExpressionTreeEqualityComparer.cs (modified) (view diffs)
• 3.4/TreeMatching/SymbolicExpressionTreeMatching.cs (modified) (view diffs)
• 3.4/TreeMatching/SymbolicExpressionTreeMaxCommonSubtreeSimilarityCalculator.cs (modified) (view diffs)
• 3.4/TreeMatching/SymbolicExpressionTreeNodeComparer.cs (modified) (view diffs)
• 3.4/TreeMatching/SymbolicExpressionTreeNodeEqualityComparer.cs (modified) (view diffs)
• 3.4/TreeMatching/SymbolicExpressionTreePhenotypicSimilarityCalculator.cs (modified) (view diffs)
• 3.4/packages.config (deleted)