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

ENH: optmize code structure of tool order

Browse Source 
1.Put reorder functions in ToolOrderUtils

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I49c7b447ba1f41f3747ba3127d842c4e3957b5ff
(cherry picked from commit 0f70c81a7d5686d8e80396f8f865f25b72618907)
This commit is contained in:
xun.zhang
2024-08-09 14:14:23 +08:00
committed by Noisyfox
parent 9380260a74
commit ec98375192
7 changed files with 612 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/libslic3r/FilamentGroup.hpp
View File

@@ -2,11 +2,11 @@
#define FILAMENT_GROUP_HPP
#include<chrono>
#include<numeric>
#include "GCode/ToolOrderUtils.hpp"
namespace Slic3r
{
using FlushMatrix = std::vector<std::vector<float>>;
struct FlushTimeMachine
{
private:
@@ -34,31 +34,22 @@ namespace Slic3r
class FilamentGroup
{
public:
public:
FilamentGroup(const std::vector<FlushMatrix>& flush_matrix, const int filament_num, const std::vector<int>& max_group_size) :
FilamentGroup(const std::vector<FlushMatrix>& flush_matrix, const int total_filament_num, const std::vector<int>& max_group_size) :
m_flush_matrix{ flush_matrix },
m_filament_num{ filament_num },
m_total_filament_num{ total_filament_num },
m_max_group_size{ max_group_size }
{}
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;}
std::vector<int> calc_filament_group(const std::vector<std::vector<unsigned int>>& layer_filaments, const FGStrategy& g_strategy = FGStrategy::BestFit, int* cost = nullptr);
private:
std::vector<int> calc_filament_group_by_enum(const std::vector<std::vector<unsigned int>>& layer_filaments, const std::vector<unsigned int>& used_filaments, const FGStrategy& g_strategy, int* cost = nullptr);
std::vector<int> calc_filament_group_by_pam(const std::vector<std::vector<unsigned int>>& layer_filaments, const std::vector<unsigned int>& used_filaments, const FGStrategy& g_strategy, int* cost = nullptr, int timeout_ms = 300);
private:
std::vector<FlushMatrix>m_flush_matrix;
int m_filament_num;
std::vector<int>m_max_group_size;
std::vector<unsigned int>m_used_filaments;
int m_total_filament_num;
public:
std::optional<std::function<bool(int, std::vector<int>&)>> get_custom_seq;
private:
std::vector<int>m_filament_labels;
std::vector<std::vector<unsigned int>>m_filament_orders;
};
class KMediods
@@ -69,10 +60,10 @@ namespace Slic3r
Farthest
};
public:
KMediods(const std::vector<std::vector<float>>& distance_matrix, const int filament_num, const std::vector<int>& max_group_size) :
KMediods(const std::vector<std::vector<float>>& distance_matrix, const int filament_num,const std::vector<int>& max_group_size) :
m_distance_matrix{ distance_matrix },
m_filament_num{ filament_num },
m_max_group_size{ max_group_size } {}
m_max_group_size{ max_group_size }{}
void fit(const FGStrategy& g_strategy,int timeout_ms = 300);
std::vector<int>get_filament_labels()const {
@@ -80,15 +71,15 @@ namespace Slic3r
}
private:
std::vector<int>initialize(INIT_TYPE type)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;
std::vector<int>initialize(INIT_TYPE type);
std::vector<int>assign_label(const std::vector<int>& medoids,const FGStrategy&g_strategy);
int calc_cost(const std::vector<int>& labels, const std::vector<int>& medoids);
private:
std::vector<std::vector<float>>m_distance_matrix;
int m_filament_num;
std::vector<int>m_max_group_size;
std::vector<int>m_used_filaments;
mutable std::set<int>m_medoids_set;
std::set<int>m_medoids_set;
const int k = 2;
private:
std::vector<int>m_filament_labels;
};