wip
This commit is contained in:
		
							parent
							
								
									a18ad919af
								
							
						
					
					
						commit
						69bc6c035d
					
				@ -116,15 +116,17 @@ class CellCustomizer
 | 
				
			|||||||
                   const std::vector<bool> &allowed_nodes,
 | 
					                   const std::vector<bool> &allowed_nodes,
 | 
				
			||||||
                   CellMetric &metric) const
 | 
					                   CellMetric &metric) const
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        Heap heap_exemplar(graph.GetNumberOfNodes());
 | 
					        // std::cerr << "Customizing cells\n";
 | 
				
			||||||
        HeapPtr heaps(heap_exemplar);
 | 
					        // Heap heap_exemplar(graph.GetNumberOfNodes());
 | 
				
			||||||
 | 
					        // HeapPtr heaps(heap_exemplar);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        for (std::size_t level = 1; level < partition.GetNumberOfLevels(); ++level)
 | 
					        for (std::size_t level = 1; level < partition.GetNumberOfLevels(); ++level)
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            tbb::parallel_for(tbb::blocked_range<std::size_t>(0, partition.GetNumberOfCells(level)),
 | 
					            tbb::parallel_for(tbb::blocked_range<std::size_t>(0, partition.GetNumberOfCells(level)),
 | 
				
			||||||
                              [&](const tbb::blocked_range<std::size_t> &range)
 | 
					                              [&](const tbb::blocked_range<std::size_t> &range)
 | 
				
			||||||
                              {
 | 
					                              {
 | 
				
			||||||
                                  auto &heap = heaps.local();
 | 
					                                Heap heap{graph.GetNumberOfNodes()};
 | 
				
			||||||
 | 
					                                //  auto &heap = heaps.local();
 | 
				
			||||||
                                  for (auto id = range.begin(), end = range.end(); id != end; ++id)
 | 
					                                  for (auto id = range.begin(), end = range.end(); id != end; ++id)
 | 
				
			||||||
                                  {
 | 
					                                  {
 | 
				
			||||||
                                      Customize(
 | 
					                                      Customize(
 | 
				
			||||||
 | 
				
			|||||||
@ -238,6 +238,9 @@ class QueryHeap
 | 
				
			|||||||
        Data data;
 | 
					        Data data;
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QueryHeap(const QueryHeap& other) = delete;
 | 
				
			||||||
 | 
					    QueryHeap(QueryHeap&& other) = delete;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    template <typename... StorageArgs> explicit QueryHeap(StorageArgs... args) : node_index(args...)
 | 
					    template <typename... StorageArgs> explicit QueryHeap(StorageArgs... args) : node_index(args...)
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        Clear();
 | 
					        Clear();
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user