diff options
author | Kelvin Zhang <zhangkelvin@google.com> | 2021-11-01 19:27:26 -0700 |
---|---|---|
committer | Kelvin Zhang <zhangkelvin@google.com> | 2021-11-02 02:38:22 +0000 |
commit | a90c04389f86ed4363674e20b0d5f171dea7ebeb (patch) | |
tree | 0a310ca653ef73c547d80da63c87fcb2c0636bcb /targets_affinity_unittest.cc | |
parent | f2da819cb37cb2376c917506fb1eb154ec61586a (diff) | |
parent | 8bb965d29e918d0559589a215ff7f4bd0874bc08 (diff) | |
download | zucchini-a90c04389f86ed4363674e20b0d5f171dea7ebeb.tar.gz |
Merge remote-tracking branch 'aosp/upstream-main' into dev
This performs a merge on upstream zucchini.
Change-Id: I8a4844407558d6f1e439939ee634fe17ed7a4e55
Diffstat (limited to 'targets_affinity_unittest.cc')
-rw-r--r-- | targets_affinity_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/targets_affinity_unittest.cc b/targets_affinity_unittest.cc index 86182f9..abcbd3f 100644 --- a/targets_affinity_unittest.cc +++ b/targets_affinity_unittest.cc @@ -25,8 +25,8 @@ TEST(TargetsAffinityTest, AffinityBetween) { auto test_affinity = [&targets_affinity]( const EquivalenceMap& equivalence_map, - const std::vector<offset_t>& old_targets, - const std::vector<offset_t>& new_targets) { + const std::deque<offset_t>& old_targets, + const std::deque<offset_t>& new_targets) { targets_affinity.InferFromSimilarities(equivalence_map, old_targets, new_targets); AffinityVector affinities(old_targets.size()); @@ -81,8 +81,8 @@ TEST(TargetsAffinityTest, AssignLabels) { auto test_labels_assignment = [&targets_affinity](const EquivalenceMap& equivalence_map, - const std::vector<offset_t>& old_targets, - const std::vector<offset_t>& new_targets, + const std::deque<offset_t>& old_targets, + const std::deque<offset_t>& new_targets, double min_affinity, const std::vector<uint32_t>& expected_old_labels, const std::vector<uint32_t>& expected_new_labels) { |