Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[c++] Initial Work for Pairwise Ranking #6182

Open
wants to merge 86 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
9ae3476
initial work for pairwise ranking (dataset part)
shiyu1994 Nov 8, 2023
2314099
remove unrelated changes
shiyu1994 Nov 8, 2023
06ddf68
Merge branch 'master' into pairwise-ranking-dev
shiyu1994 Nov 8, 2023
42e91e2
Merge branch 'master' into pairwise-ranking-dev
shiyu1994 Nov 23, 2023
a8379d4
Merge branch 'master' into pairwise-ranking-dev
shiyu1994 Dec 1, 2023
da5f02d
first version of pairwie ranking bin
shiyu1994 Dec 5, 2023
9d0afd9
Merge branch 'pairwise-ranking-dev' of https://github.com/Microsoft/L…
shiyu1994 Dec 5, 2023
0cb436d
templates for bins in pairwise ranking dataset
shiyu1994 Dec 5, 2023
fc9b381
Merge branch 'master' into pairwise-ranking-dev
shiyu1994 Dec 5, 2023
6fbc674
fix lint issues and compilation errors
shiyu1994 Dec 6, 2023
6082913
Merge branch 'pairwise-ranking-dev' of https://github.com/Microsoft/L…
shiyu1994 Dec 6, 2023
9e16dc3
add methods for pairwise bin
shiyu1994 Dec 6, 2023
6154bde
instantiate templates
shiyu1994 Dec 6, 2023
3a646eb
remove unrelated files
shiyu1994 Dec 6, 2023
9e77ab9
add return values for unimplemented methods
shiyu1994 Dec 7, 2023
eba4560
add new files and windows/LightGBM.vcxproj and windows/LightGBM.vcxpr…
shiyu1994 Dec 7, 2023
f1d2281
Merge branch 'master' into pairwise-ranking-dev
shiyu1994 Dec 7, 2023
873d7ad
create pairwise dataset
shiyu1994 Dec 7, 2023
3838b9b
Merge branch 'pairwise-ranking-dev' of https://github.com/Microsoft/L…
shiyu1994 Dec 7, 2023
986a979
set num_data_ of pairwise dataset
shiyu1994 Dec 7, 2023
c40965a
skip query with no paired items
shiyu1994 Dec 15, 2023
97d34d7
store original query information
shiyu1994 Jan 31, 2024
1e57e27
copy position information for pairwise dataset
shiyu1994 Jan 31, 2024
1699c06
rename to pointwise members
shiyu1994 Feb 1, 2024
d5b6f0a
adding initial support for pairwise gradients and NDCG eval with pair…
metpavel Feb 9, 2024
2ee1199
fix score offsets
metpavel Feb 9, 2024
fe10a2c
Merge branch 'master' into pairwise-ranking-dev
shiyu1994 Feb 19, 2024
0aaf090
skip copy for weights and label if none
shiyu1994 Feb 19, 2024
8714bfb
fix pairwise dataset bugs
shiyu1994 Feb 29, 2024
250996b
Merge branch 'master' into pairwise-ranking-dev
shiyu1994 Feb 29, 2024
38b2f3e
fix validation set with pairwise lambda rank
shiyu1994 Feb 29, 2024
09fff25
Merge branch 'pairwise-ranking-dev' of https://github.com/Microsoft/L…
shiyu1994 Feb 29, 2024
ba3c815
fix pairwise ranking objective initialization
shiyu1994 Feb 29, 2024
d9b537d
keep the original query boundaries and add pairwise query boundaries
shiyu1994 Feb 29, 2024
362baf8
allow empty queries in pairwise query boundaries
shiyu1994 Mar 1, 2024
06597ac
fix query boundaries
shiyu1994 Mar 1, 2024
18e3a1b
clean up
shiyu1994 Mar 1, 2024
43b8582
various fixes
metpavel Mar 1, 2024
ad4e89f
construct all pairs for validation set
shiyu1994 Mar 1, 2024
dc17309
Merge branch 'pairwise-ranking-dev' of https://github.com/microsoft/L…
metpavel Mar 1, 2024
1ad78b2
fix for validation set
shiyu1994 Mar 1, 2024
9cd3b93
fix validation pairs
shiyu1994 Mar 1, 2024
f9d9c07
fatal error when no query boundary is provided
shiyu1994 Mar 1, 2024
97e0a81
Merge branch 'master' into pairwise-ranking-dev
shiyu1994 Mar 1, 2024
746bc82
add differential features
shiyu1994 Mar 8, 2024
f9ab075
add differential features
shiyu1994 Mar 20, 2024
7aa170b
bug fixing and efficiency improvement
metpavel Mar 25, 2024
abdb716
add feature group for differential features
shiyu1994 Mar 27, 2024
3cdfd83
refactor template initializations with macro
shiyu1994 Mar 28, 2024
3703495
tree learning with differential features
shiyu1994 Mar 28, 2024
8f55a93
avoid copy sampled values
shiyu1994 Mar 28, 2024
8c3e7be
fix sampled indices
shiyu1994 Apr 2, 2024
5aa2d17
push data into differential features
shiyu1994 Apr 11, 2024
1c319b8
fix differential feature bugs
shiyu1994 Apr 17, 2024
d8eb68b
clean up debug code
shiyu1994 Apr 17, 2024
b088236
fix validation set with differential features
shiyu1994 Apr 18, 2024
2d09897
support row-wise histogram construction with pairwise ranking
shiyu1994 Jun 15, 2024
406d0c1
fix row wise in pairwise ranking
shiyu1994 Jun 20, 2024
6c65d1f
save for debug
shiyu1994 Jun 20, 2024
7738915
update code for debug
shiyu1994 Jun 28, 2024
d6c16df
save changes
shiyu1994 Jul 4, 2024
0d572d7
save changes for debug
shiyu1994 Jul 8, 2024
1f59f85
save changes
shiyu1994 Aug 21, 2024
0618bb2
add bagging by query for lambdarank
shiyu1994 Aug 27, 2024
185bdf6
Merge branch 'master' into bagging/bagging-by-query-for-lambdarank
shiyu1994 Aug 27, 2024
38fa4c2
fix pre-commit
shiyu1994 Aug 27, 2024
2fce147
Merge branch 'bagging/bagging-by-query-for-lambdarank' of https://git…
shiyu1994 Aug 27, 2024
1f7f967
Merge branch 'master' into bagging/bagging-by-query-for-lambdarank
shiyu1994 Aug 29, 2024
9e2a322
fix bagging by query with cuda
shiyu1994 Aug 29, 2024
666c51e
fix bagging by query test case
shiyu1994 Aug 30, 2024
9e2c338
fix bagging by query test case
shiyu1994 Aug 30, 2024
3abbc11
fix bagging by query test case
shiyu1994 Aug 30, 2024
13fa0a3
add #include <vector>
shiyu1994 Aug 30, 2024
b8427b0
merge bagging by query
shiyu1994 Sep 4, 2024
0258f07
update CMakeLists.txt
shiyu1994 Sep 4, 2024
90a95fa
fix bagging by query with pairwise lambdarank
shiyu1994 Sep 20, 2024
306af04
Merge branch 'master' into pairwise-ranking-dev
shiyu1994 Sep 20, 2024
b69913d
fix compilation error C3200 with visual studio
shiyu1994 Oct 10, 2024
6dba1cf
clean up main.cpp
shiyu1994 Oct 11, 2024
3b2e29d
Exposing configuration parameters for pairwise ranking
metpavel Oct 18, 2024
f1c32d3
fix bugs and pass by reference for SigmoidCache&
shiyu1994 Nov 8, 2024
51693e2
add pairing approach
shiyu1994 Nov 8, 2024
5071842
add at_least_one_relevant
shiyu1994 Nov 8, 2024
598764b
fix num bin for row wise in pairwise ranking
shiyu1994 Nov 21, 2024
f7deab4
save for debug
shiyu1994 Dec 17, 2024
0d1b310
update doc
shiyu1994 Dec 18, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
first version of pairwie ranking bin
  • Loading branch information
shiyu1994 committed Dec 5, 2023
commit da5f02d45f2278b3417c219a76b471df25fb9c5f
20 changes: 20 additions & 0 deletions include/LightGBM/bin.h
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,26 @@ class Bin {
*/
static Bin* CreateSparseBin(data_size_t num_data, int num_bin);

/*!
* \brief Create object for bin data of one feature, used for pairwise ranking, for an original dense bin
* \param num_data Size of the pairwise dataset
* \param num_bin Number of bin
* \param paired_ranking_item_index_map Map from data index to the original index for items in the pair
* \return The bin data object
*/
template <template<typename> typename PAIRWISE_BIN_TYPE>
static Bin* CreateDensePairwiseRankingBin(data_size_t num_data, int num_bin, const std::pair<data_size_t, data_size_t>* paired_ranking_item_index_map, const uint32_t min_bin, const uint32_t max_bin, const uint32_t most_freq_bin);

/*!
* \brief Create object for bin data of one feature, used for pairwise ranking, for an original sparse bin
* \param num_data Size of the pairwise dataset
* \param num_bin Number of bin
* \param paired_ranking_item_index_map Map from data index to the original index for items in the pair
* \return The bin data object
*/
template <template<typename> typename PAIRWISE_BIN_TYPE>
static Bin* CreateSparsePairwiseRankingBin(data_size_t num_data, int num_bin, const std::pair<data_size_t, data_size_t>* paired_ranking_item_index_map, const uint32_t min_bin, const uint32_t max_bin, const uint32_t most_freq_bin);

/*!
* \brief Deep copy the bin
*/
Expand Down
2 changes: 1 addition & 1 deletion include/LightGBM/dataset.h
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ class Metadata {

/*!
* \brief Build metadata for ranking with pairwise features from metadata of an existing ranking dataset
* \param metadata Pointer to metadata of the existing ranking dataset
* \param metadata Reference to metadata of the existing ranking dataset
*/
void BuildPairwiseFeatureRanking(const Metadata& metadata);

Expand Down
4 changes: 2 additions & 2 deletions include/LightGBM/feature_group.h
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ class FeatureGroup {
uint32_t max_bin = bin_offsets_[sub_feature + 1] - 1;
return bin_data_->GetIterator(min_bin, max_bin, most_freq_bin);
} else {
int addi = bin_mappers_[sub_feature]->GetMostFreqBin() == 0 ? 0 : 1;
int addi = most_freq_bin == 0 ? 0 : 1;
uint32_t min_bin = 1;
uint32_t max_bin = bin_mappers_[sub_feature]->num_bin() - 1 + addi;
return multi_bin_data_[sub_feature]->GetIterator(min_bin, max_bin,
Expand Down Expand Up @@ -582,7 +582,7 @@ class FeatureGroup {
}

protected:
void CreateBinData(int num_data, bool is_multi_val, bool force_dense, bool force_sparse) {
virtual void CreateBinData(int num_data, bool is_multi_val, bool force_dense, bool force_sparse) {
if (is_multi_val) {
multi_bin_data_.clear();
for (int i = 0; i < num_feature_; ++i) {
Expand Down
62 changes: 26 additions & 36 deletions include/LightGBM/pairwise_ranking_feature_group.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* Licensed under the MIT License. See LICENSE file in the project root for
* license information.
*/
#ifndef LIGHTGBM_PAIRWISE_FEATURE_GROUP_H_
#define LIGHTGBM_PAIRWISE_FEATURE_GROUP_H_
#ifndef LIGHTGBM_PAIRWISE_RANKING_FEATURE_GROUP_H_
#define LIGHTGBM_PAIRWISE_RANKING_FEATURE_GROUP_H_

#include "feature_group.h"

Expand All @@ -25,23 +25,11 @@ class PairwiseRankingFeatureGroup: public FeatureGroup {
* \param bin_mappers Bin mapper for features
* \param num_data Total number of data
* \param is_enable_sparse True if enable sparse feature
* \param is_first_or_second_in_pairing Mark whether features in this group belong to the first or second element in the pairing
*/

PairwiseRankingFeatureGroup(const FeatureGroup& other, int num_data) {
num_feature_ = other.num_feature_;
is_multi_val_ = false;
is_dense_multi_val_ = false;
is_sparse_ = false;
num_total_bin_ = other.num_total_bin_;
bin_offsets_ = other.bin_offsets_;
num_data_ = num_data;

bin_mappers_.reserve(other.bin_mappers_.size());
for (auto& bin_mapper : other.bin_mappers_) {
bin_mappers_.emplace_back(new BinMapper(*bin_mapper));
}
CreateBinData(num_data, is_multi_val_, !is_sparse_, is_sparse_);
}
PairwiseRankingFeatureGroup(const FeatureGroup& other, int num_data, const int is_first_or_second_in_pairing):
FeatureGroup(other, num_data), is_first_or_second_in_pairing_(is_first_or_second_in_pairing) {}

/*!
* \brief Constructor from memory when data is present
Expand All @@ -50,21 +38,21 @@ class PairwiseRankingFeatureGroup: public FeatureGroup {
* \param local_used_indices Local used indices, empty means using all data
* \param group_id Id of group
*/
PairwiseRankingFeatureGroup(const void* memory,
data_size_t num_all_data,
const std::vector<data_size_t>& local_used_indices,
int group_id) {
// TODO(shiyu1994)
}

/*!
* \brief Constructor from definition in memory (without data)
* \param memory Pointer of memory
* \param local_used_indices Local used indices, empty means using all data
*/
FeatureGroup(const void* memory, data_size_t num_data, int group_id) {
// TODO(shiyu1994)
}
// PairwiseRankingFeatureGroup(const void* memory,
// data_size_t num_all_data,
// const std::vector<data_size_t>& local_used_indices,
// int group_id) {
// // TODO(shiyu1994)
// }

// /*!
// * \brief Constructor from definition in memory (without data)
// * \param memory Pointer of memory
// * \param local_used_indices Local used indices, empty means using all data
// */
// PairwiseRankingFeatureGroup(const void* memory, data_size_t num_data, int group_id): FeatureGroup(memory, num_data, group_id) {
// // TODO(shiyu1994)
// }

/*! \brief Destructor */
~PairwiseRankingFeatureGroup() {}
Expand All @@ -91,17 +79,19 @@ class PairwiseRankingFeatureGroup: public FeatureGroup {
}

private:
void CreateBinData(int num_data, bool is_multi_val, bool force_dense, bool force_sparse) {
// TODO(shiyu1994)
}
template <typename PAIRWISE_BIN_TYPE>
void CreateBinDataInner(int num_data, bool is_multi_val, bool force_dense, bool force_sparse);

void CreateBinData(int num_data, bool is_multi_val, bool force_dense, bool force_sparse) override;

/*! \brief Pairwise data index to original data indices for ranking with pairwise features */
const std::pair<data_size_t, data_size_t>* paired_ranking_item_index_map_;
/*! \brief Number of pairwise data */
data_size_t num_data_;
/*! \brief Mark whether features in this group belong to the first or second element in the pairing */
const int is_first_or_second_in_pairing_;
};

} // namespace LightGBM

#endif // LIGHTGBM_PAIRWISE_FEATURE_GROUP_H_
#endif // LIGHTGBM_PAIRWISE_RANKING_FEATURE_GROUP_H_
35 changes: 35 additions & 0 deletions src/io/bin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include "multi_val_dense_bin.hpp"
#include "multi_val_sparse_bin.hpp"
#include "sparse_bin.hpp"
#include "pairwise_lambdarank_bin.hpp"

namespace LightGBM {

Expand Down Expand Up @@ -632,6 +633,38 @@ namespace LightGBM {
}
}

template <template<typename> typename PAIRWISE_BIN_TYPE>
Bin* Bin::CreateDensePairwiseRankingBin(data_size_t num_data, int num_bin, const std::pair<data_size_t, data_size_t>* paired_ranking_item_index_map, const uint32_t min_bin, const uint32_t max_bin, const uint32_t most_freq_bin) {
if (num_bin <= 16) {
return new PAIRWISE_BIN_TYPE<DenseBin<uint8_t, true>>(num_data, paired_ranking_item_index_map, new DenseBin<uint8_t, true>(num_data), min_bin, max_bin, most_freq_bin);
} else if (num_bin <= 256) {
return new PAIRWISE_BIN_TYPE<DenseBin<uint8_t, false>>(num_data, paired_ranking_item_index_map, new DenseBin<uint8_t, false>(num_data), min_bin, max_bin, most_freq_bin);
} else if (num_bin <= 65536) {
return new PAIRWISE_BIN_TYPE<DenseBin<uint16_t, false>>(num_data, paired_ranking_item_index_map, new DenseBin<uint16_t, false>(num_data), min_bin, max_bin, most_freq_bin);
} else {
return new PAIRWISE_BIN_TYPE<DenseBin<uint32_t, false>>(num_data, paired_ranking_item_index_map, new DenseBin<uint32_t, false>(num_data), min_bin, max_bin, most_freq_bin);
}
}

template <template<typename> typename PAIRWISE_BIN_TYPE>
Bin* Bin::CreateSparsePairwiseRankingBin(data_size_t num_data, int num_bin, const std::pair<data_size_t, data_size_t>* paired_ranking_item_index_map, const uint32_t min_bin, const uint32_t max_bin, const uint32_t most_freq_bin) {
if (num_bin <= 256) {
return new PAIRWISE_BIN_TYPE<SparseBin<uint8_t>>(num_data, paired_ranking_item_index_map, new SparseBin<uint8_t>(num_data), min_bin, max_bin, most_freq_bin);
} else if (num_bin <= 65536) {
return new PAIRWISE_BIN_TYPE<SparseBin<uint16_t>>(num_data, paired_ranking_item_index_map, new SparseBin<uint16_t>(num_data), min_bin, max_bin, most_freq_bin);
} else {
return new PAIRWISE_BIN_TYPE<SparseBin<uint32_t>>(num_data, paired_ranking_item_index_map, new SparseBin<uint32_t>(num_data), min_bin, max_bin, most_freq_bin);
}
}

template Bin* Bin::CreateSparsePairwiseRankingBin<PairwiseRankingFirstBin>(data_size_t num_data, int num_bin, const std::pair<data_size_t, data_size_t>* paired_ranking_item_index_map, const uint32_t min_bin, const uint32_t max_bin, const uint32_t most_freq_bin);

template Bin* Bin::CreateSparsePairwiseRankingBin<PairwiseRankingSecondBin>(data_size_t num_data, int num_bin, const std::pair<data_size_t, data_size_t>* paired_ranking_item_index_map, const uint32_t min_bin, const uint32_t max_bin, const uint32_t most_freq_bin);

template Bin* Bin::CreateDensePairwiseRankingBin<PairwiseRankingFirstBin>(data_size_t num_data, int num_bin, const std::pair<data_size_t, data_size_t>* paired_ranking_item_index_map, const uint32_t min_bin, const uint32_t max_bin, const uint32_t most_freq_bin);

template Bin* Bin::CreateDensePairwiseRankingBin<PairwiseRankingSecondBin>(data_size_t num_data, int num_bin, const std::pair<data_size_t, data_size_t>* paired_ranking_item_index_map, const uint32_t min_bin, const uint32_t max_bin, const uint32_t most_freq_bin);

MultiValBin* MultiValBin::CreateMultiValBin(data_size_t num_data, int num_bin, int num_feature,
double sparse_rate, const std::vector<uint32_t>& offsets) {
if (sparse_rate >= multi_val_bin_sparse_threshold) {
Expand Down Expand Up @@ -705,6 +738,8 @@ namespace LightGBM {
}
}



template <>
const void* DenseBin<uint8_t, false>::GetColWiseData(
uint8_t* bit_type,
Expand Down
4 changes: 3 additions & 1 deletion src/io/dataset.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <LightGBM/dataset.h>

#include <LightGBM/feature_group.h>
#include <LightGBM/pairwise_ranking_feature_group.h>
#include <LightGBM/cuda/vector_cudahost.h>
#include <LightGBM/utils/array_args.h>
#include <LightGBM/utils/openmp_wrapper.h>
Expand Down Expand Up @@ -847,6 +848,7 @@ void Dataset::CreatePairWiseRankingData(const Dataset* dataset, std::vector<std:
for (int i = 0; i < num_groups_; ++i) {
int original_group_index = i % dataset->num_groups_;
int original_group_feature_start = dataset->group_feature_start_[original_group_index];
const int is_first_or_second_in_pairing = original_group_index / dataset->num_groups_; // 0 for first, 1 for second
group_feature_start_[i] = cur_feature_index;
for (int feature_index_in_group = 0; feature_index_in_group < dataset->group_feature_cnt_[original_group_index]; ++feature_index_in_group) {
const BinMapper* feature_bin_mapper = dataset->FeatureBinMapper(original_group_feature_start + feature_index_in_group);
Expand All @@ -857,7 +859,7 @@ void Dataset::CreatePairWiseRankingData(const Dataset* dataset, std::vector<std:
feature2subfeature_.push_back(dataset->feature2subfeature_[original_group_feature_start + feature_index_in_group]);
cur_feature_index += 1;
}
feature_groups_.emplace_back(new FeatureGroup(*dataset->feature_groups_[original_group_index].get(), num_data_));
feature_groups_.emplace_back(new PairwiseRankingFeatureGroup(*dataset->feature_groups_[original_group_index].get(), num_data_, is_first_or_second_in_pairing));
num_total_bin += dataset->FeatureGroupNumBin(original_group_index);
group_bin_boundaries_.push_back(num_total_bin);
group_feature_cnt_[i] = dataset->group_feature_cnt_[original_group_index];
Expand Down
95 changes: 71 additions & 24 deletions src/io/pairwise_lambdarank_bin.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,20 @@

namespace LightGBM {

template <typename VAL_T>
template <typename BIN_TYPE>
class PairwiseRankingFirstBin;

template <typename BIN_TYPE>
class PairwiseRankingSecondBin;

template <typename BIN_TYPE>
class PairwiseRankingFirstIterator: public BinIterator {
friend PairwiseRankingFirstBin<BIN_TYPE>;
public:
PairwiseRankingFirstIterator(const Bin* unpaired_bin, const std::pair<data_size_t, data_size_t>* paired_ranking_item_index_map) {
PairwiseRankingFirstIterator(const BIN_TYPE* unpaired_bin, const std::pair<data_size_t, data_size_t>* paired_ranking_item_index_map, const uint32_t min_bin, const uint32_t max_bin, const uint32_t most_freq_bin) {
unpaired_bin_ = unpaired_bin;
unpaired_bin_iterator_ = unpaired_bin_->GetIterator();
unpaired_bin_iterator_->Reset();
unpaired_bin_iterator_ = unpaired_bin_->GetIterator(min_bin, max_bin, most_freq_bin);
unpaired_bin_iterator_->Reset(0);
paired_ranking_item_index_map_ = paired_ranking_item_index_map;
prev_index_ = 0;
prev_val_ = 0;
Expand All @@ -25,20 +32,20 @@ class PairwiseRankingFirstIterator: public BinIterator {
~PairwiseRankingFirstIterator() {}

uint32_t Get(data_size_t idx) {
const data_size_t data_index = paired_ranking_item_index_map[idx].first
const data_size_t data_index = paired_ranking_item_index_map_[idx].first;
if (data_index != prev_index_) {
CHECK_GT(data_index, prev_index_);
prev_val_ = unpaired_bin_iterator_i_->Get(data_index);
prev_val_ = unpaired_bin_iterator_->Get(data_index);
}
prev_index_ = data_index;
return prev_val_;
}

uint32_t RawGet(data_size_t idx) {
const data_size_t data_index = paired_ranking_item_index_map[idx].first
const data_size_t data_index = paired_ranking_item_index_map_[idx].first;
if (data_index != prev_index_) {
CHECK_GT(data_index, prev_index_);
prev_val_ = unpaired_bin_iterator_i_->RawGet(data_index);
prev_val_ = unpaired_bin_iterator_->RawGet(data_index);
}
prev_index_ = data_index;
return prev_val_;
Expand All @@ -51,43 +58,43 @@ class PairwiseRankingFirstIterator: public BinIterator {
}

private:
const Bin* unpaired_bin_;
const BIN_TYPE* unpaired_bin_;
BinIterator* unpaired_bin_iterator_;
const std::pair<data_size_t, data_size_t>* paired_ranking_item_index_map_;
const data_size_t prev_index_;
const uint32_t prev_val_;
data_size_t prev_index_;
uint32_t prev_val_;
};

template <typename VAL_T>
template <typename BIN_TYPE>
class PairwiseRankingSecondIterator: public BinIterator {
friend PairwiseRankingSecondBin<BIN_TYPE>;
public:
PairwiseRankingSecondIterator(const Bin* unpaired_bin, const std::pair<data_size_t, data_size_t>* paired_ranking_item_index_map) {
PairwiseRankingSecondIterator(const BIN_TYPE* unpaired_bin, const std::pair<data_size_t, data_size_t>* paired_ranking_item_index_map, const uint32_t min_bin, const uint32_t max_bin, const uint32_t most_freq_bin) {
unpaired_bin_ = unpaired_bin;
unpaired_bin_iterator_ = unpaired_bin_->GetIterator();
unpaired_bin_iterator_->Reset();
unpaired_bin_iterator_ = unpaired_bin_->GetIterator(min_bin, max_bin, most_freq_bin);
unpaired_bin_iterator_->Reset(0);
paired_ranking_item_index_map_ = paired_ranking_item_index_map;
prev_index_ = 0;
prev_val_ = 0;
}

~PairwiseRankingSecondIterator() {}

uint32_t Get(data_size_t idx) {
const data_size_t data_index = paired_ranking_item_index_map[idx].second
const data_size_t data_index = paired_ranking_item_index_map_[idx].second;
if (data_index < prev_index_) {
unpaired_bin_iterator_i_.Reset(0);
unpaired_bin_iterator_->Reset(0);
}
prev_index_ = data_index;
return unpaired_bin_iterator_i_->Get(data_index);
return unpaired_bin_iterator_->Get(data_index);
}

uint32_t RawGet(data_size_t idx) {
const data_size_t data_index = paired_ranking_item_index_map[idx].second
const data_size_t data_index = paired_ranking_item_index_map_[idx].second;
if (data_index < prev_index_) {
unpaired_bin_iterator_i_.Reset(0);
unpaired_bin_iterator_->Reset(0);
}
prev_index_ = data_index;
return unpaired_bin_iterator_i_->RawGet(data_index);
return unpaired_bin_iterator_->RawGet(data_index);
}

void Reset(data_size_t idx) {
Expand All @@ -96,10 +103,50 @@ class PairwiseRankingSecondIterator: public BinIterator {
}

private:
const Bin* unpaired_bin_;
const BIN_TYPE* unpaired_bin_;
BinIterator* unpaired_bin_iterator_;
const std::pair<data_size_t, data_size_t>* paired_ranking_item_index_map_;
const data_size_t prev_index_;
data_size_t prev_index_;
};

template <typename BIN_TYPE>
class PairwiseRankingFirstBin: public BIN_TYPE {
public:
PairwiseRankingFirstBin(data_size_t num_data, const std::pair<data_size_t, data_size_t>* paired_ranking_item_index_map, const BIN_TYPE* unpaired_bin, const uint32_t min_bin, const uint32_t max_bin, const uint32_t most_freq_bin): BIN_TYPE(0), unpaired_bin_(unpaired_bin), min_bin_(min_bin), max_bin_(max_bin), most_freq_bin_(most_freq_bin) {
paired_ranking_item_index_map_ = paired_ranking_item_index_map;
num_data_ = num_data;
}

BinIterator* GetIterator(uint32_t min_bin, uint32_t max_bin, uint32_t most_freq_bin) const override {
return new PairwiseRankingFirstIterator<BIN_TYPE>(unpaired_bin_.get(), paired_ranking_item_index_map_, min_bin_, max_bin_, most_freq_bin_);
}

private:
const std::pair<data_size_t, data_size_t>* paired_ranking_item_index_map_;
const std::shared_ptr<const BIN_TYPE> unpaired_bin_;
const uint32_t min_bin_;
const uint32_t max_bin_;
const uint32_t most_freq_bin_;
};

template <typename BIN_TYPE>
class PairwiseRankingSecondBin: public BIN_TYPE {
public:
PairwiseRankingSecondBin(data_size_t num_data, const std::pair<data_size_t, data_size_t>* paired_ranking_item_index_map, const BIN_TYPE* unpaired_bin, const uint32_t min_bin, const uint32_t max_bin, const uint32_t most_freq_bin): BIN_TYPE(0), unpaired_bin_(unpaired_bin), min_bin_(min_bin), max_bin_(max_bin), most_freq_bin_(most_freq_bin) {
paired_ranking_item_index_map_ = paired_ranking_item_index_map;
num_data_ = num_data;
}

BinIterator* GetIterator(uint32_t min_bin, uint32_t max_bin, uint32_t most_freq_bin) const override {
return new PairwiseRankingSecondIterator<BIN_TYPE>(unpaired_bin_.get(), paired_ranking_item_index_map_, min_bin_, max_bin_, most_freq_bin_);
}

private:
const std::pair<data_size_t, data_size_t>* paired_ranking_item_index_map_;
const std::shared_ptr<const BIN_TYPE> unpaired_bin_;
const uint32_t min_bin_;
const uint32_t max_bin_;
const uint32_t most_freq_bin_;
};

} // LightGBM
Expand Down
Loading