2019-06-17 08:07:14 +00:00
|
|
|
/// Trait for types that we can compute a maximum cover for.
|
|
|
|
///
|
|
|
|
/// Terminology:
|
|
|
|
/// * `item`: something that implements this trait
|
|
|
|
/// * `element`: something contained in a set, and covered by the covering set of an item
|
|
|
|
/// * `object`: something extracted from an item in order to comprise a solution
|
|
|
|
/// See: https://en.wikipedia.org/wiki/Maximum_coverage_problem
|
|
|
|
pub trait MaxCover {
|
|
|
|
/// The result type, of which we would eventually like a collection of maximal quality.
|
|
|
|
type Object;
|
|
|
|
/// The type used to represent sets.
|
|
|
|
type Set: Clone;
|
|
|
|
|
|
|
|
/// Extract an object for inclusion in a solution.
|
|
|
|
fn object(&self) -> Self::Object;
|
|
|
|
|
|
|
|
/// Get the set of elements covered.
|
|
|
|
fn covering_set(&self) -> &Self::Set;
|
|
|
|
/// Update the set of items covered, for the inclusion of some object in the solution.
|
|
|
|
fn update_covering_set(&mut self, max_obj: &Self::Object, max_set: &Self::Set);
|
|
|
|
/// The quality of this item's covering set, usually its cardinality.
|
|
|
|
fn score(&self) -> usize;
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Helper struct to track which items of the input are still available for inclusion.
|
|
|
|
/// Saves removing elements from the work vector.
|
|
|
|
struct MaxCoverItem<T> {
|
|
|
|
item: T,
|
|
|
|
available: bool,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<T> MaxCoverItem<T> {
|
|
|
|
fn new(item: T) -> Self {
|
|
|
|
MaxCoverItem {
|
|
|
|
item,
|
|
|
|
available: true,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Compute an approximate maximum cover using a greedy algorithm.
|
|
|
|
///
|
|
|
|
/// * Time complexity: `O(limit * items_iter.len())`
|
|
|
|
/// * Space complexity: `O(item_iter.len())`
|
Update to frozen spec ❄️ (v0.8.1) (#444)
* types: first updates for v0.8
* state_processing: epoch processing v0.8.0
* state_processing: block processing v0.8.0
* tree_hash_derive: support generics in SignedRoot
* types v0.8: update to use ssz_types
* state_processing v0.8: use ssz_types
* ssz_types: add bitwise methods and from_elem
* types: fix v0.8 FIXMEs
* ssz_types: add bitfield shift_up
* ssz_types: iterators and DerefMut for VariableList
* types,state_processing: use VariableList
* ssz_types: fix BitVector Decode impl
Fixed a typo in the implementation of ssz::Decode for BitVector, which caused it
to be considered variable length!
* types: fix test modules for v0.8 update
* types: remove slow type-level arithmetic
* state_processing: fix tests for v0.8
* op_pool: update for v0.8
* ssz_types: Bitfield difference length-independent
Allow computing the difference of two bitfields of different lengths.
* Implement compact committee support
* epoch_processing: committee & active index roots
* state_processing: genesis state builder v0.8
* state_processing: implement v0.8.1
* Further improve tree_hash
* Strip examples, tests from cached_tree_hash
* Update TreeHash, un-impl CachedTreeHash
* Update bitfield TreeHash, un-impl CachedTreeHash
* Update FixedLenVec TreeHash, unimpl CachedTreeHash
* Update update tree_hash_derive for new TreeHash
* Fix TreeHash, un-impl CachedTreeHash for ssz_types
* Remove fixed_len_vec, ssz benches
SSZ benches relied upon fixed_len_vec -- it is easier to just delete
them and rebuild them later (when necessary)
* Remove boolean_bitfield crate
* Fix fake_crypto BLS compile errors
* Update ef_tests for new v.8 type params
* Update ef_tests submodule to v0.8.1 tag
* Make fixes to support parsing ssz ef_tests
* `compact_committee...` to `compact_committees...`
* Derive more traits for `CompactCommittee`
* Flip bitfield byte-endianness
* Fix tree_hash for bitfields
* Modify CLI output for ef_tests
* Bump ssz crate version
* Update ssz_types doc comment
* Del cached tree hash tests from ssz_static tests
* Tidy SSZ dependencies
* Rename ssz_types crate to eth2_ssz_types
* validator_client: update for v0.8
* ssz_types: update union/difference for bit order swap
* beacon_node: update for v0.8, EthSpec
* types: disable cached tree hash, update min spec
* state_processing: fix slot bug in committee update
* tests: temporarily disable fork choice harness test
See #447
* committee cache: prevent out-of-bounds access
In the case where we tried to access the committee of a shard that didn't have a committee in the
current epoch, we were accessing elements beyond the end of the shuffling vector and panicking! This
commit adds a check to make the failure safe and explicit.
* fix bug in get_indexed_attestation and simplify
There was a bug in our implementation of get_indexed_attestation whereby
incorrect "committee indices" were used to index into the custody bitfield. The
bug was only observable in the case where some bits of the custody bitfield were
set to 1. The implementation has been simplified to remove the bug, and a test
added.
* state_proc: workaround for compact committees bug
https://github.com/ethereum/eth2.0-specs/issues/1315
* v0.8: updates to make the EF tests pass
* Remove redundant max operation checks.
* Always supply both messages when checking attestation signatures -- allowing
verification of an attestation with no signatures.
* Swap the order of the fork and domain constant in `get_domain`, to match
the spec.
* rustfmt
* ef_tests: add new epoch processing tests
* Integrate v0.8 into master (compiles)
* Remove unused crates, fix clippy lints
* Replace v0.6.3 tags w/ v0.8.1
* Remove old comment
* Ensure lmd ghost tests only run in release
* Update readme
2019-07-30 02:44:51 +00:00
|
|
|
pub fn maximum_cover<I, T>(items_iter: I, limit: usize) -> Vec<T::Object>
|
2019-06-17 08:07:14 +00:00
|
|
|
where
|
|
|
|
I: IntoIterator<Item = T>,
|
|
|
|
T: MaxCover,
|
|
|
|
{
|
|
|
|
// Construct an initial vec of all items, marked available.
|
|
|
|
let mut all_items: Vec<_> = items_iter
|
|
|
|
.into_iter()
|
|
|
|
.map(MaxCoverItem::new)
|
|
|
|
.filter(|x| x.item.score() != 0)
|
|
|
|
.collect();
|
|
|
|
|
|
|
|
let mut result = vec![];
|
|
|
|
|
|
|
|
for _ in 0..limit {
|
|
|
|
// Select the item with the maximum score.
|
|
|
|
let (best_item, best_cover) = match all_items
|
|
|
|
.iter_mut()
|
|
|
|
.filter(|x| x.available && x.item.score() != 0)
|
|
|
|
.max_by_key(|x| x.item.score())
|
|
|
|
{
|
|
|
|
Some(x) => {
|
|
|
|
x.available = false;
|
|
|
|
(x.item.object(), x.item.covering_set().clone())
|
|
|
|
}
|
|
|
|
None => return result,
|
|
|
|
};
|
|
|
|
|
|
|
|
// Update the covering sets of the other items, for the inclusion of the selected item.
|
|
|
|
// Items covered by the selected item can't be re-covered.
|
|
|
|
all_items
|
|
|
|
.iter_mut()
|
|
|
|
.filter(|x| x.available && x.item.score() != 0)
|
|
|
|
.for_each(|x| x.item.update_covering_set(&best_item, &best_cover));
|
|
|
|
|
|
|
|
result.push(best_item);
|
|
|
|
}
|
|
|
|
|
|
|
|
result
|
|
|
|
}
|
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod test {
|
|
|
|
use super::*;
|
|
|
|
use std::iter::FromIterator;
|
|
|
|
use std::{collections::HashSet, hash::Hash};
|
|
|
|
|
|
|
|
impl<T> MaxCover for HashSet<T>
|
|
|
|
where
|
|
|
|
T: Clone + Eq + Hash,
|
|
|
|
{
|
|
|
|
type Object = Self;
|
|
|
|
type Set = Self;
|
|
|
|
|
|
|
|
fn object(&self) -> Self {
|
|
|
|
self.clone()
|
|
|
|
}
|
|
|
|
|
|
|
|
fn covering_set(&self) -> &Self {
|
|
|
|
&self
|
|
|
|
}
|
|
|
|
|
|
|
|
fn update_covering_set(&mut self, _: &Self, other: &Self) {
|
|
|
|
let mut difference = &*self - other;
|
|
|
|
std::mem::swap(self, &mut difference);
|
|
|
|
}
|
|
|
|
|
|
|
|
fn score(&self) -> usize {
|
|
|
|
self.len()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn example_system() -> Vec<HashSet<usize>> {
|
|
|
|
vec![
|
|
|
|
HashSet::from_iter(vec![3]),
|
|
|
|
HashSet::from_iter(vec![1, 2, 4, 5]),
|
|
|
|
HashSet::from_iter(vec![1, 2, 4, 5]),
|
|
|
|
HashSet::from_iter(vec![1]),
|
|
|
|
HashSet::from_iter(vec![2, 4, 5]),
|
|
|
|
]
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn zero_limit() {
|
|
|
|
let cover = maximum_cover(example_system(), 0);
|
|
|
|
assert_eq!(cover.len(), 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn one_limit() {
|
|
|
|
let sets = example_system();
|
|
|
|
let cover = maximum_cover(sets.clone(), 1);
|
|
|
|
assert_eq!(cover.len(), 1);
|
|
|
|
assert_eq!(cover[0], sets[1]);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check that even if the limit provides room, we don't include useless items in the soln.
|
|
|
|
#[test]
|
|
|
|
fn exclude_zero_score() {
|
|
|
|
let sets = example_system();
|
|
|
|
for k in 2..10 {
|
|
|
|
let cover = maximum_cover(sets.clone(), k);
|
|
|
|
assert_eq!(cover.len(), 2);
|
|
|
|
assert_eq!(cover[0], sets[1]);
|
|
|
|
assert_eq!(cover[1], sets[0]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn quality<T: Eq + Hash>(solution: &[HashSet<T>]) -> usize {
|
|
|
|
solution.iter().map(HashSet::len).sum()
|
|
|
|
}
|
|
|
|
|
|
|
|
// Optimal solution is the first three sets (quality 15) but our greedy algorithm
|
|
|
|
// will select the last three (quality 11). The comment at the end of each line
|
|
|
|
// shows that set's score at each iteration, with a * indicating that it will be chosen.
|
|
|
|
#[test]
|
|
|
|
fn suboptimal() {
|
|
|
|
let sets = vec![
|
|
|
|
HashSet::from_iter(vec![0, 1, 8, 11, 14]), // 5, 3, 2
|
|
|
|
HashSet::from_iter(vec![2, 3, 7, 9, 10]), // 5, 3, 2
|
|
|
|
HashSet::from_iter(vec![4, 5, 6, 12, 13]), // 5, 4, 2
|
|
|
|
HashSet::from_iter(vec![9, 10]), // 4, 4, 2*
|
|
|
|
HashSet::from_iter(vec![5, 6, 7, 8]), // 4, 4*
|
|
|
|
HashSet::from_iter(vec![0, 1, 2, 3, 4]), // 5*
|
|
|
|
];
|
|
|
|
let cover = maximum_cover(sets.clone(), 3);
|
|
|
|
assert_eq!(quality(&cover), 11);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn intersecting_ok() {
|
|
|
|
let sets = vec![
|
|
|
|
HashSet::from_iter(vec![1, 2, 3, 4, 5, 6, 7, 8]),
|
|
|
|
HashSet::from_iter(vec![1, 2, 3, 9, 10, 11]),
|
|
|
|
HashSet::from_iter(vec![4, 5, 6, 12, 13, 14]),
|
|
|
|
HashSet::from_iter(vec![7, 8, 15, 16, 17, 18]),
|
|
|
|
HashSet::from_iter(vec![1, 2, 9, 10]),
|
|
|
|
HashSet::from_iter(vec![1, 5, 6, 8]),
|
|
|
|
HashSet::from_iter(vec![1, 7, 11, 19]),
|
|
|
|
];
|
|
|
|
let cover = maximum_cover(sets.clone(), 5);
|
|
|
|
assert_eq!(quality(&cover), 19);
|
|
|
|
assert_eq!(cover.len(), 5);
|
|
|
|
}
|
|
|
|
}
|