5a42e15c4a
Squashed messages from 9 commits: 9. Properties now uses PropertyFamily and contained classes. Fetching,seting,clearing properties can be done with PropertyFamilyKey or PropertyTypeKey. Hierarchy of newly added clases is: Vertices -n-> PropertyFamily {name: String} <-1-n-> PropertyType {type: Property::Flags} Edges -n-> PropertyFamily {name: String} <-1-n-> PropertyType {type: Property::Flags} PropertyFamilyKey -> PropertyType PropertyTypeKey -> PropertyType PropertyType t0,t1; let t0!=t1 be true let t0.family==t1.family be true then next is true PropertyTypeKey{&t0}!=PropertyTypeKey{&t1} PropertyFamilyKey{&t0}==PropertyFamilyKey{&t1} PropertyFamilyKey{&t0}==PropertyTypeKey{&t1} PropertyTypeKey{&t0}==PropertyFamilyKey{&t1} 8. Intermedate commit. Noticed that integration queries throw SEGFAULT. 7. Defined interface for indexes. Fixed three memory leaks. Fixed integration_queries test which now passes. 6. Commit which return Xorshift128plus to valid shape. 5. Tmp commit. 4. Label Index is compiling. 3. tmp 2. Vertex::Accessor now updates Label index. 1. Applied changes for code review.
33 lines
810 B
C++
33 lines
810 B
C++
#pragma once
|
|
|
|
#include "utils/iterator/iterator_base.hpp"
|
|
|
|
namespace iter
|
|
{
|
|
// Wraps function into interator with next().
|
|
// T - type of return value
|
|
// F - type of wraped function
|
|
template <class T, class F>
|
|
class FunctionIterator : public IteratorBase<T>
|
|
{
|
|
public:
|
|
FunctionIterator(F &&f) : func(std::move(f)) {}
|
|
|
|
Option<T> next() final { return func(); }
|
|
|
|
private:
|
|
F func;
|
|
};
|
|
|
|
// Wraps function which returns options as an iterator.
|
|
template <class F>
|
|
auto make_iterator(F &&f)
|
|
{
|
|
// Because function isn't receving or in any way using type T from
|
|
// FunctionIterator compiler can't deduce it thats way there is decltype in
|
|
// construction of FunctionIterator. Resoulting type of iter.next().take()
|
|
// is T.
|
|
return FunctionIterator<decltype(f().take()), F>(std::move(f));
|
|
}
|
|
}
|