Skip to content

Updated #33

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.

Sign up for GitHub

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

Merged
afloresep merged 7 commits into from
Jun 11, 2026
Merged

Updated #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
09ab246
Layout updates
daenuprobst Jun 9, 2026
dd08f0e
Layout updates
daenuprobst Jun 9, 2026
b0a76b0
perf(connect): use scipy connected_components for component detection
afloresep Jun 10, 2026
ece3475
fix(estimator): keep layout deterministic with a custom layout_config
afloresep Jun 10, 2026
a1fa13e
fix(tests): import LayoutConfig lazily so pytest-core collects withou…
afloresep Jun 10, 2026
3c23648
style: apply ruff format to connect.py and test_connect.py
afloresep Jun 10, 2026
94a5068
style(lint): import Callable from collections.abc (ruff UP035)
afloresep Jun 10, 2026
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
27 changes: 24 additions & 3 deletions cpp/include/layout.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
namespace tmap {

// =============================================================================
// Configuration
// Config
// =============================================================================

/// Placer algorithm for initial node placement during uncoarsening
Expand Down Expand Up @@ -37,6 +37,12 @@ enum class ScalingType {
RelativeToDrawing // Scale relative to drawing (default)
};

/// Crossing-reduction post-pass mode
enum class UntangleMode {
Rotate, // best of several rotations about the parent (+ reflection); default
Reflect // only flip each subtree across its parent->child axis
};

/// Layout configuration matching original TMAP parameters
struct LayoutConfig {
// k-NN graph construction (used by layout_from_lsh_forest)
Expand Down Expand Up @@ -66,7 +72,23 @@ struct LayoutConfig {
// Node size (affects repulsion)
float node_size = 1.0f / 65.0f;

// Determinism: if set, use single thread + seed
// Per-level adaptive layout
bool adaptive = true;
double ns_cap = 0.03;
double ns_coef = 2.5;
double ns_exp = 0.40;
bool quad_rotate = true;

// Crossing-reduction post-pass
bool untangle = true;
UntangleMode untangle_mode = UntangleMode::Rotate;
int untangle_max_sub = 2000; //(0 => no cap)
int untangle_passes = 4;
int untangle_rot_steps = 64;
double untangle_max_angle = 90.0;
double untangle_slide_eps = 0.0;
int untangle_slide_steps = 5;

bool deterministic = false;
std::optional<uint32_t> seed = std::nullopt;
};
Expand All @@ -75,7 +97,6 @@ struct LayoutConfig {
// Result types
// =============================================================================

/// Layout result: coordinates + edge topology
struct LayoutResult {
std::vector<float> x; // X coordinates (n_nodes)
std::vector<float> y; // Y coordinates (n_nodes)
Expand Down
Loading