Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
11/11/14 12:56:55 (8 years ago)
Author:
mkommend
Message:

#2245: Merged r11380, r11381 & r11403 into stable.

Location:
stable
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.DataPreprocessing/3.4/Implementations/ManipulationContent.cs

    r11170 r11537  
    4141    }
    4242
    43     public ManipulationContent(IManipulationLogic theManipulationLogic, ISearchLogic theSearchLogic, IFilterLogic theFitlerLogic) {
     43    public ManipulationContent(IManipulationLogic theManipulationLogic, ISearchLogic theSearchLogic, IFilterLogic theFilterLogic) {
    4444      manipulationLogic = theManipulationLogic;
    4545      searchLogic = theSearchLogic;
    46       filterLogic = theFitlerLogic;
     46      filterLogic = theFilterLogic;
    4747    }
    4848
  • stable/HeuristicLab.DataPreprocessing/3.4/Implementations/ManipulationLogic.cs

    r11170 r11537  
    225225    }
    226226
    227     public void ShuffleWithRanges() {
    228       ShuffleWithRanges(new[] {
    229         preprocessingData.TestPartition,
    230         preprocessingData.TrainingPartition
    231       });
    232     }
    233 
    234     public void ShuffleWithRanges(IEnumerable<IntRange> ranges) {
    235       // init random outside loop
     227    public void Shuffle(bool shuffleRangesSeparately) {
    236228      Random random = new Random();
    237 
    238       preprocessingData.InTransaction(() => {
    239         // process all given ranges - e.g. TrainingPartition, TestPartition
    240         foreach (IntRange range in ranges) {
    241           List<Tuple<int, int>> shuffledIndices = new List<Tuple<int, int>>();
    242 
    243           // generate random indices used for shuffeling each column
    244           for (int i = range.End - 1; i >= range.Start; --i) {
    245             int rand = random.Next(range.Start, i);
    246             shuffledIndices.Add(new Tuple<int, int>(i, rand));
    247           }
    248 
    249           ShuffleToIndices(shuffledIndices);
    250         }
    251       });
     229      var ranges = new[] { preprocessingData.TestPartition, preprocessingData.TrainingPartition };
     230      if (shuffleRangesSeparately) {
     231        preprocessingData.InTransaction(() => {
     232          // process all given ranges - e.g. TrainingPartition, TestPartition
     233          foreach (IntRange range in ranges) {
     234            List<Tuple<int, int>> shuffledIndices = new List<Tuple<int, int>>();
     235
     236            // generate random indices used for shuffeling each column
     237            for (int i = range.End - 1; i >= range.Start; --i) {
     238              int rand = random.Next(range.Start, i);
     239              shuffledIndices.Add(new Tuple<int, int>(i, rand));
     240            }
     241
     242            ShuffleToIndices(shuffledIndices);
     243          }
     244        });
     245      } else {
     246        preprocessingData.InTransaction(() => {
     247          var indices = ranges.SelectMany(x => Enumerable.Range(x.Start, x.Size)).ToList();
     248          var shuffledIndices = indices.OrderBy(x => random.Next());
     249          ShuffleToIndices(indices.Zip(shuffledIndices, (i, j) => new Tuple<int, int>(i, j)).ToList());
     250        });
     251      }
    252252    }
    253253
  • stable/HeuristicLab.DataPreprocessing/3.4/Interfaces/IManipulationLogic.cs

    r11170 r11537  
    3838    void ReplaceIndicesByValue(IDictionary<int, IList<int>> cells, string value);
    3939    void ReplaceIndicesByValue<T>(int columnIndex, IEnumerable<int> rowIndices, T value);
    40     void ShuffleWithRanges();
    41     void ShuffleWithRanges(IEnumerable<HeuristicLab.Data.IntRange> ranges);
     40    void Shuffle(bool shuffleRangesSeparately);
    4241    List<int> RowsWithMissingValuesGreater(double percent);
    4342    List<int> ColumnsWithMissingValuesGreater(double percent);
Note: See TracChangeset for help on using the changeset viewer.