Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/08/14 20:02:59 (10 years ago)
Author:
mkommend
Message:

#2171: Merged r10601:r10607, r10653, r11075, r11076, r11077, r11080, r11081 into stable.

Location:
stable
Files:
2 edited
1 copied

Legend:

Unmodified
Added
Removed

  • stable

    • Property svn:ignore

      •  

        old new  
        88FxCopResults.txt
        99Google.ProtocolBuffers-0.9.1.dll
         10Google.ProtocolBuffers-2.4.1.473.dll
        1011HeuristicLab 3.3.5.1.ReSharper.user
        1112HeuristicLab 3.3.6.0.ReSharper.user
        1213HeuristicLab.4.5.resharper.user
        1314HeuristicLab.ExtLibs.6.0.ReSharper.user
         15HeuristicLab.Scripting.Development
        1416HeuristicLab.resharper.user
        1517ProtoGen.exe
        … …  
        1719_ReSharper.HeuristicLab
        1820_ReSharper.HeuristicLab 3.3
         21_ReSharper.HeuristicLab 3.3 Tests
        1922_ReSharper.HeuristicLab.ExtLibs
        2023bin
        2124protoc.exe
        22 _ReSharper.HeuristicLab 3.3 Tests
        23 Google.ProtocolBuffers-2.4.1.473.dll
    • Property svn:mergeinfo changed
      /trunk/sourcesmerged: 10601-10607,​10653,​11075-11077,​11080-11081

  • stable/HeuristicLab.Problems.ParameterOptimization/3.3/BestSolutionsAnalyzer.cs

    r10594 r11151  
    121121      var bestSolutions = (ItemSet<DoubleArray>)results[BestSolutionsResultName].Value;
    122122      //clear best solutions if new found quality is better than the existing one
    123       if (max && bestQuality > previousBestQuality
    124           || !max && bestQuality < previousBestQuality)
     123      if (max && bestQuality > previousBestQuality || !max && bestQuality < previousBestQuality)
    125124        bestSolutions.Clear();
    126125
    … …  
    134133        }
    135134      }
    136       PreviousBestQualityParameter.ActualValue = (DoubleValue)BestQualityParameter.ActualValue.Clone();
    137135
     136      //update best quality
     137      if (max && bestQuality >= BestQualityParameter.ActualValue.Value
     138          || !max && bestQuality <= BestQualityParameter.ActualValue.Value) {
     139        BestQualityParameter.ActualValue.Value = bestQuality;
     140      }
    138141      //update best known quality
    139142      if (bestKnownQuality == null || max && bestQuality > bestKnownQuality.Value
    … …  
    141144        BestKnownQualityParameter.ActualValue = new DoubleValue(bestQuality);
    142145      }
     146      PreviousBestQualityParameter.ActualValue = (DoubleValue)BestQualityParameter.ActualValue.Clone();
    143147
    144148      return base.Apply();
    … …  
    156160    public int GetHashCode(DoubleArray obj) {
    157161      if (obj == null) return 0;
    158       return obj.Aggregate(23, (current, item) => current ^ (int)item);
     162      return (int)obj.Aggregate(23L, (current, item) => current ^ System.BitConverter.DoubleToInt64Bits(item));
    159163    }
    160164  }
Note: See TracChangeset for help on using the changeset viewer.