Free cookie consent management tool by TermsFeed Policy Generator

Changeset 12867 for branches


Ignore:
Timestamp:
08/17/15 15:35:20 (9 years ago)
Author:
ascheibe
Message:

#2388 merged trunk into branch

Location:
branches/HiveStatistics/sources
Files:
4 deleted
12 edited
4 copied

Legend:

Unmodified
Added
Removed

  • branches/HiveStatistics/sources

  • branches/HiveStatistics/sources/HeuristicLab 3.3.sln

    r12843 r12867  
    350350Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.OKB.Views-3.3", "HeuristicLab.Clients.OKB.Views\3.3\HeuristicLab.Clients.OKB.Views-3.3.csproj", "{399EBB6E-37A1-4AE4-B8CD-0D461FF286A3}"
    351351EndProject
    352 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.LawnMower", "HeuristicLab.Problems.LawnMower\3.3\HeuristicLab.Problems.LawnMower.csproj", "{9A04599C-D608-4240-8DA6-D41F51C515A3}"
    353 EndProject
    354 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.LawnMower.Views", "HeuristicLab.Problems.LawnMower.Views\3.3\HeuristicLab.Problems.LawnMower.Views.csproj", "{71CDE004-C50F-48DF-858E-AB0AAA3537BC}"
     352Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.LawnMower-3.3", "HeuristicLab.Problems.LawnMower\3.3\HeuristicLab.Problems.LawnMower-3.3.csproj", "{9A04599C-D608-4240-8DA6-D41F51C515A3}"
     353EndProject
     354Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.LawnMower.Views-3.3", "HeuristicLab.Problems.LawnMower.Views\3.3\HeuristicLab.Problems.LawnMower.Views-3.3.csproj", "{71CDE004-C50F-48DF-858E-AB0AAA3537BC}"
    355355EndProject
    356356Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.ScatterSearch-3.3", "HeuristicLab.Algorithms.ScatterSearch\3.3\HeuristicLab.Algorithms.ScatterSearch-3.3.csproj", "{5FEE5DB4-7FD9-4CBD-BEC2-3FEE17B31A94}"
    … …  
    379379Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Instances.Scheduling-3.3", "HeuristicLab.Problems.Instances.Scheduling\3.3\HeuristicLab.Problems.Instances.Scheduling-3.3.csproj", "{9D792B6D-836B-46DC-9D69-50B4B1E7B87F}"
    380380EndProject
    381 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.ParallelEngine.Views", "HeuristicLab.ParallelEngine.Views\3.3\HeuristicLab.ParallelEngine.Views.csproj", "{D34A7620-3E23-40D9-8647-637BE901F271}"
     381Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.ParallelEngine.Views-3.3", "HeuristicLab.ParallelEngine.Views\3.3\HeuristicLab.ParallelEngine.Views-3.3.csproj", "{D34A7620-3E23-40D9-8647-637BE901F271}"
    382382EndProject
    383383Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.CMAEvolutionStrategy-3.3", "HeuristicLab.Algorithms.CMAEvolutionStrategy\3.3\HeuristicLab.Algorithms.CMAEvolutionStrategy-3.3.csproj", "{5E516C4F-9935-437F-8B15-ECEF4451744E}"
    … …  
    421421Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.ExternalEvaluation.Views-3.4", "HeuristicLab.Problems.ExternalEvaluation.Views\3.4\HeuristicLab.Problems.ExternalEvaluation.Views-3.4.csproj", "{F7E5B975-FDF2-45A4-91CB-FF6D3C33D65E}"
    422422EndProject
    423 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.NK", "HeuristicLab.Problems.NK\3.3\HeuristicLab.Problems.NK.csproj", "{C3AD50E6-E717-490E-ABC7-32EF7FB03C97}"
     423Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.NK-3.3", "HeuristicLab.Problems.NK\3.3\HeuristicLab.Problems.NK-3.3.csproj", "{C3AD50E6-E717-490E-ABC7-32EF7FB03C97}"
    424424EndProject
    425425Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OutdatedPlugins", "OutdatedPlugins", "{D1B1DE45-F9C7-4FBF-B73C-E759BC4223D5}"

  • branches/HiveStatistics/sources/HeuristicLab.Analysis.Statistics.Views/3.3/StatisticalTestsView.cs

    r12843 r12867  
    275275        data = new double[columnNames.Count()][];
    276276
     277        if (!groups.Any() || !columnNames.Any()) {
     278          return;
     279        }
     280
    277281        DoubleMatrix dt = new DoubleMatrix(groups.Select(x => x.Count()).Max(), columnNames.Count());
    278282        dt.ColumnNames = columnNames;
    … …  
    311315
    312316      foreach (string cn in columnNames) {
    313         var tmpRuns = runs.Where(x => ((string)((dynamic)x.Parameters[parameterName]).Value.ToString()) == cn);
     317        var tmpRuns = runs.Where(x =>
     318        x.Parameters.ContainsKey(parameterName) &&
     319        (((string)((dynamic)x.Parameters[parameterName]).Value.ToString()) == cn));
    314320        runCols.Add(tmpRuns);
    315321      }
    … …  
    331337
    332338    private bool VerifyDataLength(bool showMessage) {
    333       if (data == null || data.Length == 0)
     339      if (data == null || data.Length < 2)
    334340        return false;
    335341
    … …  
    457463      double[][] newData = FilterDataForPairwiseTest(colIndex);
    458464
    459       var rowNames = new[] { "p-Value of Mann-Whitney U", "Adjusted p-Value of Mann-Whitney U", 
     465      var rowNames = new[] { "p-Value of Mann-Whitney U", "Adjusted p-Value of Mann-Whitney U",
    460466            "p-Value of T-Test", "Adjusted p-Value of T-Test", "Cohen's d", "Hedges' g" };
    461467

  • branches/HiveStatistics/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding

  • branches/HiveStatistics/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/FullTreeCreator.cs

    r12422 r12867  
    7777      rootNode.AddSubtree(startNode);
    7878
    79       Create(random, startNode, maxTreeDepth - 2);
     79      Create(random, startNode, maxTreeDepth-1);
    8080      tree.Root = rootNode;
    8181      return tree;
    … …  
    9999      for (var i = 0; i < arity; i++) {
    100100        var possibleSymbols = allowedSymbols
    101           .Where(s => seedNode.Grammar.IsAllowedChildSymbol(seedNode.Symbol, s, i))
     101          .Where(s => seedNode.Grammar.IsAllowedChildSymbol(seedNode.Symbol, s, i)
     102                   && seedNode.Grammar.GetMinimumExpressionDepth(s) <= maxDepth
     103                   && seedNode.Grammar.GetMaximumExpressionDepth(s) >= maxDepth)
    102104          .ToList();
    103105        var weights = possibleSymbols.Select(s => s.InitialFrequency).ToList();
    … …  
    142144        var selectedSymbol = possibleSymbols.SelectRandom(weights, random);
    143145#pragma warning restore 612, 618
    144        
     146
    145147        var tree = selectedSymbol.CreateTreeNode();
    146148        if (tree.HasLocalParameters) tree.ResetLocalParameters(random);

  • branches/HiveStatistics/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/GrowTreeCreator.cs

    r12422 r12867  
    7474      rootNode.AddSubtree(startNode);
    7575
    76       Create(random, startNode, maxTreeDepth - 2);
     76      Create(random, startNode, maxTreeDepth - 1);
    7777      tree.Root = rootNode;
    7878      return tree;

  • branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis

  • branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionSolution.cs

    r12012 r12867  
    4141    double TrainingNormalizedMeanSquaredError { get; }
    4242    double TestNormalizedMeanSquaredError { get; }
     43    double TrainingRootMeanSquaredError { get; }
     44    double TestRootMeanSquaredError { get; }
    4345  }
    4446}

  • branches/HiveStatistics/sources/HeuristicLab.Problems.LawnMower

  • branches/HiveStatistics/sources/HeuristicLab.Problems.QuadraticAssignment.Algorithms/3.3/RobustTabooSeachOperator.cs

    r12843 r12867  
    180180      bool already_aspired = false;
    181181
    182       double evaluations = EvaluatedSolutionsParameter.ActualValue.Value;
     182      double evaluations = EvaluatedSolutionEquivalentsParameter.ActualValue.Value;
    183183      foreach (Swap2Move move in ExhaustiveSwap2MoveGenerator.Generate(solution)) {
    184184        double moveQuality;

  • branches/HiveStatistics/sources/HeuristicLab.Tests

  • branches/HiveStatistics/sources/HeuristicLab.Tests/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4/FullTreeCreatorTest.cs

    r12012 r12867  
    5353      foreach (var tree in randomTrees) {
    5454        Util.IsValid(tree);
    55         Assert.IsTrue(tree.Depth == MAX_TREE_DEPTH);
     55        Assert.IsTrue(tree.Depth-1 == MAX_TREE_DEPTH);
    5656        if (maxLength < tree.Length)
    5757          maxLength = tree.Length;
Note: See TracChangeset for help on using the changeset viewer.