PQ_Compare required

Author: tdhock

R/RcppExports.R

@@ -1,28 +1,28 @@
 # Generated by using Rcpp::compileAttributes() -> do not edit by hand
 # Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393
 
-### Efficient log-linear cumulative median.
+#' Efficient log-linear cumulative median.
 cum_median_interface <- function(data_vec, weight_vec) {
     .Call(`_binsegRcpp_cum_median_interface`, data_vec, weight_vec)
 }
 
-### Use depth first search to compute a data.frame
-### with one row for each segment, and columns
-### splits and depth, number/depth of candidate
-### splits that need to be
-### computed after splitting that segment.
+#' Use depth first search to compute a data.frame
+#' with one row for each segment, and columns
+#' splits and depth, number/depth of candidate
+#' splits that need to be
+#' computed after splitting that segment.
 depth_first_interface <- function(n_data, min_segment_length) {
     .Call(`_binsegRcpp_depth_first_interface`, n_data, min_segment_length)
 }
 
-### Compute a data.frame with one row for each distribution
-### implemented in the C++ code, and columns distribution.str,
-### parameters, description.
+#' Compute a data.frame with one row for each distribution
+#' implemented in the C++ code, and columns distribution.str,
+#' parameters, description.
 get_distribution_info <- function() {
     .Call(`_binsegRcpp_get_distribution_info`)
 }
 
-### Low-level interface to binary segmentation algorithm.
+#' Low-level interface to binary segmentation algorithm.
 binseg_interface <- function(data_vec, weight_vec, max_segments, min_segment_length, distribution_str, container_str, is_validation_vec, position_vec) {
     .Call(`_binsegRcpp_binseg_interface`, data_vec, weight_vec, max_segments, min_segment_length, distribution_str, container_str, is_validation_vec, position_vec)
 }

src/binseg.cpp

@@ -401,8 +401,8 @@ container_umap_type* get_container_umap(void){
   return &container_umap;
 }
 
-#define CMAKER(CONTAINER, INSERT, SET_IT, GET_SEG, ERASE)		\
-  class CONCAT(CONTAINER,Wrapper) : public MyContainer< std::CONTAINER<Segment> > { \
+#define CMAKER(CONTAINER, STRUCT, INSERT, SET_IT, GET_SEG, ERASE)	\
+  class CONCAT(CONTAINER,Wrapper) : public MyContainer< STRUCT > {	\
   public:                                                               \
     void insert(Segment& new_seg){                                      \
       segment_container.INSERT(new_seg);                                \
@@ -423,14 +423,25 @@ container_umap_type* get_container_umap(void){
   static ContainerFactory CONCAT(CONTAINER,_instance)                   \
     ( #CONTAINER, CONCAT(CONTAINER,construct), CONCAT(CONTAINER,destruct) );
 
-#define CIT(CONTAINER, INSERT, BEST) \
-  CMAKER(CONTAINER, INSERT, std::CONTAINER<Segment>::iterator it = BEST, *it, segment_container.erase(it))
+#define CIT(CONTAINER, INSERT, BEST)				\
+  CMAKER(CONTAINER, std::CONTAINER<Segment>, INSERT, std::CONTAINER<Segment>::iterator it = BEST, *it, segment_container.erase(it))
 
 CIT(multiset, insert, segment_container.begin())
 
 CIT(list, push_back, std::min_element(segment_container.begin(),segment_container.end()))
 
-CMAKER(priority_queue, push, , segment_container.top(), segment_container.pop())
+class PQ_Compare {
+public:
+  bool operator()(Segment a, Segment b){
+    return !(a < b);
+  }
+};
+#define PQ_STRUCT std::priority_queue<Segment,std::vector<Segment>,PQ_Compare>
+CMAKER(priority_queue, PQ_STRUCT, push, , segment_container.top(), segment_container.pop())
+//template <class T, class Container = vector<T>,  class Compare = less<typename Container::value_type> >
+//template < class T,                        // multiset::key_type/value_type           class Compare = less<T>,        // multiset::key_compare/value_compare           class Alloc = allocator<T> >    // multiset::allocator_type           > class multiset;
+
+
 
 class Candidates {
 public: