Skip to content
Snippets Groups Projects
  1. May 15, 2017
  2. May 14, 2017
    • Mark OLESEN's avatar
      BUG: hashtable key_iterator ++ operator returning incorrect type · 4b0d1632
      Mark OLESEN authored
      ENH: ensure std::distance works with hashtable iterators
      4b0d1632
    • Mark OLESEN's avatar
      ENH: avoid std::distance for std::initializer_list · 0c53a815
      Mark OLESEN authored
      - std::initializer_list has its own size() method, so no need to use
        std::distance.
      
      STYLE/BUG: use separate iterator de-reference and increment in List
      
      - avoids unnecessary copying of iterators, and avoids any potentially
        odd behaviour with the combination with incrementing.
      
      ENH: support construct from iterator pair for DynamicList, SortableList
      0c53a815
    • Mark OLESEN's avatar
      ENH: improvements to labelRange const_iterator · 83669e28
      Mark OLESEN authored
      - inherit from std::iterator to obtain the full STL typedefs, meaning
        that std::distance works and the following is now possible:
      
            labelRange range(100, 1500);
            scalarList list(range.begin(), range.end());
      
        --
        Note that this does not work (mismatched data-types):
      
            scalarList list = identity(12345);
      
        But this does, since the *iter promotes label to scalar:
      
            labelList ident = identity(12345);
            scalarList list(ident.begin(), ident.end());
      
        It is however more than slightly wasteful to create a labelList
        just for initializing a scalarList. An alternative could be a
        a labelRange for the same purpose.
      
            labelRange ident = labelRange::identity(12345);
            scalarList list(ident.begin(), ident.end());
      
        Or this
            scalarList list
            (
                labelRange::null.begin(),
                labelRange::identity(12345).end()
            );
      83669e28
  3. May 12, 2017
  4. May 11, 2017
    • Mark OLESEN's avatar
      ENH: added HashTable 'lookup' and 'retain' methods · f73b5b62
      Mark OLESEN authored
      - lookup(): with a default value (const access)
        For example,
            Map<label> something;
            value = something.lookup(key, -1);
      
          being equivalent to the following:
      
            Map<label> something;
            value = -1;  // bad value
            if (something.found(key))
            {
                value = something[key];
            }
      
          except that lookup also makes it convenient to handle const references.
          Eg,
      
            const labelList& ids = someHash.lookup(key, labelList());
      
      - For consistency, provide a two parameter HashTable '()' operator.
        The lookup() method is, however, normally preferable when
        const-only access is to be ensured.
      
      - retain(): the counterpart to erase(), it only retains entries
        corresponding to the listed keys.
      
        For example,
            HashTable<someType> largeCache;
            wordHashSet preserve = ...;
      
            largeCache.retain(preserve);
      
          being roughly equivalent to the following two-stage process,
          but with reduced overhead and typing, and fewer potential mistakes.
      
            HashTable<someType> largeCache;
            wordHashSet preserve = ...;
      
            {
                wordHashSet cull(largeCache.toc()); // all keys
                cull.erase(preserve);               // except those to preserve
                largeCache.erase(cull);             //
            }
      
        The HashSet &= operator and retain() are functionally equivalent,
        but retain() also works with dissimilar value types.
      f73b5b62
  5. May 10, 2017
  6. May 08, 2017
  7. May 07, 2017
  8. May 05, 2017
  9. May 04, 2017
  10. May 02, 2017
  11. May 01, 2017
    • Mark OLESEN's avatar
      ENH: HashSet iterators operator* now return Key. · f8c58bdd
      Mark OLESEN authored
      - much more useful than returning nil. Can now use with a for range:
      
          for (auto i : myLabelHashSet)
          {
              ...
          }
      f8c58bdd
    • Mark OLESEN's avatar
      ENH: add HashTable::writeKeys and HashSet::writeList · 8f75bfbe
      Mark OLESEN authored
      - can use the hash-set writeList in combination with FlatOutput:
      
        Eg, flatOutput(myHashSet);
      8f75bfbe
    • Mark OLESEN's avatar
      ENH: improve overall consistency of the HashTable and its iterators · c0a50dc6
      Mark OLESEN authored
      - previously had a mismash of const/non-const attributes on iterators
        that were confused with the attributes of the object being accessed.
      
      - use the iterator keys() and object() methods consistently for all
        internal access of the HashTable iterators. This makes the intention
        clearer, the code easier to maintain, and protects against any
        possible changes in the definition of the operators.
      
      - 'operator*': The standard form expected by STL libraries.
        However, for the std::map, this dereferences to a <key,value> pair,
        whereas OpenFOAM dereferences simply to <value>.
      
      - 'operator()': OpenFOAM treats this like the 'operator*'
      
      - adjusted the values of end() and cend() to reinterpret from nullObject
        instead of returning a static iteratorEnd() object.
        This means that C++ templates can now correctly deduce and match
        the return types from begin() and end() consistently.
        So that range-based now works.
      
        Eg,
            HashTable<label> table1 = ...;
            for (auto i : table1)
            {
                Info<< i << endl;
            }
      
        Since the 'operator*' returns hash table values, this prints all the
        values in the table.
      c0a50dc6
    • Mark OLESEN's avatar
      ENH: ensure nullObject is large enough for reinterpret · 0298c02b
      Mark OLESEN authored
      - previously occupied 1 byte. Now occupies enough to hold a pointer,
        which helps if using reinterpret_cast to something that has some
        member content.
      0298c02b
    • Mark OLESEN's avatar
      BUG: comparison to static end() for hashtable lookup. · 7cceda62
      Mark OLESEN authored
      - just use the iterator method found() as an alternative and
        convenient way to avoid the issue with less typing.
      7cceda62
    • Mark OLESEN's avatar
      BUG: comparison with incorrect construction tables · dc57c016
      Mark OLESEN authored
      - previously hidden when hashtable used a static method and a
        different class for end()
      dc57c016
    • Mark OLESEN's avatar
      ENH: support UList[labelRange] and SubList construction with labelRange · 805b76d4
      Mark OLESEN authored
      This uses a concept similar to what std::valarray and std::slice do.
      A labelRange provides a convenient container for holding start/size
      and lends itself to addressing 'sliced' views of lists.
      For safety, the operations and constructors restricts the given input range
      to a valid addressible region of the underlying list, while the labelRange
      itself precludes negative sizes.
      
      The SubList version is useful for patches or other things that have a
      SubList as its parameter. Otherwise the UList [] operator will be the
      more natural solution. The slices can be done with a labelRange, or
      a {start,size} pair.
      
      Examples,
           labelList list1 = identity(20);
      
           list1[labelRange(18,10)]  = -1;
           list1[{-20,25}] = -2;
           list1[{1000,5}] = -3;
      
           const labelList list2 = identity(20);
           list2[{5,10}] = -3;  // ERROR: cannot assign to const!
      805b76d4