Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
06/26/19 08:13:50 (5 years ago)
Author:
gkronber
Message:

#2925: merged r17007:17033 from trunk to branch

Location:
branches/2925_AutoDiffForDynamicalModels
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/2925_AutoDiffForDynamicalModels

  • branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Core

  • branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Core/3.3/Collections/CheckedItemCollection.cs

    r16662 r17035  
    2323using System.Collections.Generic;
    2424using System.Linq;
     25using HEAL.Attic;
    2526using HeuristicLab.Collections;
    2627using HeuristicLab.Common;
    27 using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Core {
     
    108108
    109109    /// <summary>
     110    /// Sets the checked state of <paramref name="items"/> to <paramref name="checkedState"/>.
     111    /// </summary>
     112    /// <param name="items">The items to set the checked state for.</param>
     113    /// <param name="checkedState">The new checked state of <paramref name="item"/></param>
     114    public void SetItemCheckedState(IEnumerable<T> items, bool checkedState) {
     115      var changed = new List<T>();
     116      foreach (var item in items) {
     117        if (!this.checkedState.TryGetValue(item, out bool currentState)) throw new ArgumentException();
     118        if (currentState != checkedState) {
     119          this.checkedState[item] = checkedState;
     120          changed.Add(item);
     121        }
     122      }
     123      if (changed.Count > 0) OnCheckedItemsChanged(changed);
     124    }
     125
     126    /// <summary>
    110127    /// Adds a new <paramref name="item"/> with the given <paramref name="checkedState"/>.
    111128    /// </summary>
  • branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Core/3.3/Collections/CheckedItemList.cs

    r16662 r17035  
    2323using System.Collections.Generic;
    2424using System.Linq;
     25using HEAL.Attic;
    2526using HeuristicLab.Collections;
    2627using HeuristicLab.Common;
    27 using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Core {
     
    111111    /// Sets the checked state of <paramref name="item"/> to <paramref name="checkedState"/>.
    112112    /// </summary>
     113    /// <remarks>
     114    /// This method is slower than <see cref="SetItemCheckedState(int, bool)"/>.
     115    /// </remarks>
    113116    /// <param name="item">The item to set the checked state for.</param>
    114117    /// <param name="checkedState">The new checked state of <paramref name="item"/></param>
    115118    public void SetItemCheckedState(T item, bool checkedState) {
    116       if (!this.checkedState.ContainsKey(item)) throw new ArgumentException();
    117       if (this.checkedState[item] != checkedState) {
    118         this.checkedState[item] = checkedState;
    119         OnCheckedItemsChanged(new IndexedItem<T>[] { new IndexedItem<T>(IndexOf(item), item) });
    120       }
     119      SetItemCheckedState(IndexOf(item), checkedState);
     120    }
     121
     122    /// <summary>
     123    /// Sets the checked state of <paramref name="items"/> to <paramref name="checkedState"/>.
     124    /// </summary>
     125    /// <remarks>
     126    /// This method is slower than <see cref="SetItemCheckedState(IEnumerable{int}, bool)"/>.
     127    /// </remarks>
     128    /// <param name="items">The items to set the checked state for.</param>
     129    /// <param name="checkedState">The new checked state of <paramref name="item"/></param>
     130    public void SetItemCheckedState(IEnumerable<T> items, bool checkedState) {
     131      var changed = new List<IndexedItem<T>>();
     132      foreach (var item in items) {
     133        if (!this.checkedState.TryGetValue(item, out bool currentState)) throw new ArgumentException();
     134        if (currentState != checkedState) {
     135          this.checkedState[item] = checkedState;
     136          changed.Add(new IndexedItem<T>(IndexOf(item), item));
     137        }
     138      }
     139      if (changed.Count > 0) OnCheckedItemsChanged(changed);
    121140    }
    122141
     
    127146    /// <param name="checkedState">The new checked state of the item.</param>
    128147    public void SetItemCheckedState(int itemIndex, bool checkedState) {
    129       SetItemCheckedState(this[itemIndex], checkedState);
     148      var item = list[itemIndex];
     149      if (!this.checkedState.TryGetValue(item, out bool currentState)) throw new ArgumentException();
     150      if (currentState != checkedState) {
     151        this.checkedState[item] = checkedState;
     152        OnCheckedItemsChanged(new IndexedItem<T>[] { new IndexedItem<T>(itemIndex, item) });
     153      }
     154    }
     155
     156    /// <summary>
     157    /// Sets the checked state of all <paramref name="itemIndices"/> to <paramref name="checkedState"/>.
     158    /// </summary>
     159    /// <param name="itemIndices">The indices of all items to set the checked state for.</param>
     160    /// <param name="checkedState">The new checked state of the item.</param>
     161    public void SetItemCheckedState(IEnumerable<int> itemIndices, bool checkedState) {
     162      var changed = new List<IndexedItem<T>>();
     163      foreach (var index in itemIndices) {
     164        var item = list[index];
     165        if (!this.checkedState.TryGetValue(item, out bool currentState)) throw new ArgumentException();
     166        if (currentState != checkedState) {
     167          this.checkedState[item] = checkedState;
     168          changed.Add(new IndexedItem<T>(index, item));
     169        }
     170      }
     171      if (changed.Count > 0) OnCheckedItemsChanged(changed);
    130172    }
    131173
  • branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Core/3.3/Collections/ReadOnlyCheckedItemCollection.cs

    r16662 r17035  
    2222using System;
    2323using System.Collections.Generic;
     24using HEAL.Attic;
    2425using HeuristicLab.Collections;
    2526using HeuristicLab.Common;
    26 using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Core {
     
    7575    }
    7676
     77    public void SetItemCheckedState(IEnumerable<T> items, bool checkedState) {
     78      CheckedItemCollection.SetItemCheckedState(items, checkedState);
     79    }
     80
    7781    public void Add(T item, bool checkedState) {
    7882      throw new NotSupportedException();
  • branches/2925_AutoDiffForDynamicalModels/HeuristicLab.Core/3.3/Collections/ReadOnlyCheckedItemList.cs

    r16662 r17035  
    2222using System;
    2323using System.Collections.Generic;
     24using HEAL.Attic;
    2425using HeuristicLab.Collections;
    2526using HeuristicLab.Common;
    26 using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Core {
     
    7272    }
    7373
     74    public bool ItemChecked(int itemIndex) {
     75      return CheckedItemList.ItemChecked(itemIndex);
     76    }
     77
    7478    public void SetItemCheckedState(T item, bool checkedState) {
    7579      CheckedItemList.SetItemCheckedState(item, checkedState);
     80    }
     81
     82    public void SetItemCheckedState(IEnumerable<T> items, bool checkedState) {
     83      CheckedItemList.SetItemCheckedState(items, checkedState);
     84    }
     85
     86    public void SetItemCheckedState(int itemIndex, bool checkedState) {
     87      CheckedItemList.SetItemCheckedState(itemIndex, checkedState);
     88    }
     89
     90    public void SetItemCheckedState(IEnumerable<int> itemIndices, bool checkedState) {
     91      CheckedItemList.SetItemCheckedState(itemIndices, checkedState);
    7692    }
    7793
Note: See TracChangeset for help on using the changeset viewer.