juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-10 02:37:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENH: add filament group strategy

Browse Source 
1.When capacity is greater than the num of filaments, always choose the
map result that can be accommodated
2.In BestFit strategy,always try to fill up the existing capacity
3.In BestCost strategy, just try the group with fewest flush

jira:NEW

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ifd6d64b77774039e57ffff26cf2243a4d3f89054
(cherry picked from commit cddf8cae27f4320f830b463e92703d3a6cf344e7)
This commit is contained in:
xun.zhang
2024-07-12 18:04:01 +08:00
committed by Noisyfox
parent 7aa1980813
commit 5a6b215ef0
3 changed files with 82 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libslic3r/FilamentGroup.hpp
View File

@@ -26,9 +26,15 @@ namespace Slic3r
}
};
enum FGStrategy {
BestCost,
BestFit
};
class FilamentGroup
{
public:
public:
FilamentGroup(const std::vector<FlushMatrix>& flush_matrix, const int filament_num, const std::vector<int>& max_group_size) :
m_flush_matrix{ flush_matrix },
@@ -36,9 +42,9 @@ namespace Slic3r
m_max_group_size{ max_group_size }
{}
int calc_filament_group(const std::vector<std::vector<unsigned int>>& layer_filaments);
int calc_filament_group_by_enum(const std::vector<std::vector<unsigned int>>& layer_filaments);
int calc_filament_group_by_pam(const std::vector<std::vector<unsigned int>>& layer_filaments, int timeout_ms = 300);
int calc_filament_group(const std::vector<std::vector<unsigned int>>& layer_filaments, const FGStrategy& g_strategy = FGStrategy::BestFit);
int calc_filament_group_by_enum(const std::vector<std::vector<unsigned int>>& layer_filaments,const FGStrategy& g_strategy);
int calc_filament_group_by_pam(const std::vector<std::vector<unsigned int>>& layer_filaments,const FGStrategy& g_strategy,int timeout_ms = 300);
std::vector<int> get_filament_map() const {return m_filament_labels;}
@@ -68,14 +74,14 @@ namespace Slic3r
m_filament_num{ filament_num },
m_max_group_size{ max_group_size } {}
void fit(int timeout_ms = 300);
void fit(const FGStrategy& g_strategy,int timeout_ms = 300);
std::vector<int>get_filament_labels()const {
return m_filament_labels;
}
private:
std::vector<int>initialize(INIT_TYPE type)const;
std::vector<int>assign_label(const std::vector<int>& medoids)const;
std::vector<int>assign_label(const std::vector<int>& medoids,const FGStrategy&g_strategy)const;
int calc_cost(const std::vector<int>& labels, const std::vector<int>& medoids)const;
private:
std::vector<std::vector<float>>m_distance_matrix;