Skip to content
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

Jump to bottom

[WIP] Path Mapping Barycenters #1025

Draft
wants to merge 81 commits into
base: dev
Choose a base branch
from
Draft

[WIP] Path Mapping Barycenters #1025

wants to merge 81 commits into from

Commits on Nov 2, 2022

  1. Started working on Clustering integration of bdi-ed. Not working yet.

    @floWetzels
    floWetzels committed Nov 2, 2022
    Configuration menu
    Copy the full SHA
    60e52a8 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2022

  1. some work on bdi-ed clustering. (experimental state)

    @floWetzels
    floWetzels committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    5719031 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2022

  1. MergeTreeClustering: Mapping visualizations working for Path Mapping … 

    …Distance. Branch Mapping Distance still buggy.
    @floWetzels
    floWetzels committed Nov 14, 2022
    Configuration menu
    Copy the full SHA
    909049d View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2022

  1. Some testing code for branch mapping distance.

    @floWetzels
    floWetzels committed Nov 16, 2022
    Configuration menu
    Copy the full SHA
    2012fdb View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2022

  1. merged dev branch and fixed conflicts

    @floWetzels
    floWetzels committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    7fbe0b7 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2022

  1. [MergeTreeVisu] dimension shift for planar layout

    @MatPont
    MatPont committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    da9aee8 View commit details
    Browse the repository at this point in the history

  2. [MergeTreeVisu] custom shift and fix planar layout z shift

    @MatPont
    MatPont committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    b2275cb View commit details
    Browse the repository at this point in the history

  3. Some debugging/testing output in Branch Mapping Distance

    @floWetzels
    floWetzels committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    3384a39 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'mt_layout_dimension_shift' of https://github.com/MatPon… 

    …t/ttk into bdi-ed_clustering
    @floWetzels
    floWetzels committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    6a10932 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2022

  1. Branch Mapping Distance fixed.

    @floWetzels
    floWetzels committed Nov 21, 2022
    Configuration menu
    Copy the full SHA
    1362fc2 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2022

  1. Some work on barycenters with path mapping distance.

    @floWetzels
    floWetzels committed Nov 24, 2022
    Configuration menu
    Copy the full SHA
    29be198 View commit details
    Browse the repository at this point in the history

  2. Some work on barycenters with path mapping distance.

    @floWetzels
    floWetzels committed Nov 24, 2022
    Configuration menu
    Copy the full SHA
    5c9fb8b View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2022

  1. enable custom bd for branch mapping

    @MatPont
    MatPont committed Dec 2, 2022
    Configuration menu
    Copy the full SHA
    63e81ef View commit details
    Browse the repository at this point in the history

  2. [PathMapping] change dummy node matching

    @MatPont
    MatPont committed Dec 2, 2022
    Configuration menu
    Copy the full SHA
    4c0c8f9 View commit details
    Browse the repository at this point in the history

  3. [PlanarLayout] fix diff and offset for general branch decomposition

    @MatPont
    MatPont committed Dec 2, 2022
    Configuration menu
    Copy the full SHA
    14c75fe View commit details
    Browse the repository at this point in the history

  4. Merge branch 'branchMapping_layout_fix' into mapping_planar_layout

    @MatPont
    MatPont committed Dec 2, 2022
    Configuration menu
    Copy the full SHA
    b443073 View commit details
    Browse the repository at this point in the history

  5. first working version of path mapping barycenter

    @floWetzels
    floWetzels committed Dec 2, 2022
    Configuration menu
    Copy the full SHA
    f2aa0f0 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'mapping_planar_layout' of https://github.com/MatPont/ttk … 

    …into bdi-ed_clustering
    @floWetzels
    floWetzels committed Dec 2, 2022
    Configuration menu
    Copy the full SHA
    100ac0c View commit details
    Browse the repository at this point in the history

  7. implemented alphas for path mapping clustering and fixed some warnings

    @floWetzels
    floWetzels committed Dec 2, 2022
    Configuration menu
    Copy the full SHA
    01cc9b2 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2022

  1. Bugfixes for MergeTreeBarycenter with Path Mapping Distance. Still no… 

    …t working for join trees.
    @floWetzels
    floWetzels committed Dec 5, 2022
    Configuration menu
    Copy the full SHA
    ecd72dd View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2022

  1. Fixed bugs for barycenter computation with bdi-ed

    @floWetzels
    floWetzels committed Dec 7, 2022
    Configuration menu
    Copy the full SHA
    37230ab View commit details
    Browse the repository at this point in the history

  2. some cleanup in MergeTreeClustering

    @floWetzels
    floWetzels committed Dec 7, 2022
    Configuration menu
    Copy the full SHA
    10652d9 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2022

  1. [MergeTreeVisu] Branch Mapping planar layout

    @MatPont
    MatPont committed Dec 9, 2022
    Configuration menu
    Copy the full SHA
    84f3760 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2022

  1. MergeTreeClustering working with Path Mapping Distance

    @floWetzels
    floWetzels committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    94c831c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' of https://github.com/topology-tool-kit/ttk into b… 

    …di-ed_clustering
    @floWetzels
    floWetzels committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    4cf2d22 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2022

  1. [MergeTreeVisu] fix isImportantPair for general branch decomposition

    @MatPont
    MatPont committed Dec 15, 2022
    Configuration menu
    Copy the full SHA
    d4e524f View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2022

  1. Merge branch 'mapping_planar_layout' of https://github.com/MatPont/ttk … 

    …into bdi-ed_clustering
    @floWetzels
    floWetzels committed Dec 16, 2022
    Configuration menu
    Copy the full SHA
    238524d View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2023

  1. Merge branch 'bdi-ed_clustering' into mapping_planar_layout

    @MatPont
    MatPont committed Jan 13, 2023
    Configuration menu
    Copy the full SHA
    7c3d4a0 View commit details
    Browse the repository at this point in the history

  2. [PathLayout] add path layout filter parameter and remove some old code

    @MatPont
    MatPont committed Jan 13, 2023
    Configuration menu
    Copy the full SHA
    4a1fdde View commit details
    Browse the repository at this point in the history

  3. [PathLayout] work on layout

    @MatPont
    MatPont committed Jan 13, 2023
    Configuration menu
    Copy the full SHA
    cd5bc07 View commit details
    Browse the repository at this point in the history

  4. [MergeTreeVisu] fix is important pair for general BD and put back per… 

    …sistence pre-positioning
    @MatPont
    MatPont committed Jan 13, 2023
    Configuration menu
    Copy the full SHA
    e079a63 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'mapping_planar_layout' of https://github.com/MatPont/ttk … 

    …into mapping_planar_layout
    @MatPont
    MatPont committed Jan 13, 2023
    Configuration menu
    Copy the full SHA
    0847068 View commit details
    Browse the repository at this point in the history

  6. [MergeTreeVisu] fix is important pair for general BD

    @MatPont
    MatPont committed Jan 13, 2023
    Configuration menu
    Copy the full SHA
    0f0c940 View commit details
    Browse the repository at this point in the history

  7. [MergeTreeVisu] work on path planar layout

    @MatPont
    MatPont committed Jan 13, 2023
    Configuration menu
    Copy the full SHA
    bf61533 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2023

  1. [MergeTreeClustering] path planar layout option in vtk layer

    @MatPont
    MatPont committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    c962b63 View commit details
    Browse the repository at this point in the history

  2. [MergeTreeVisu] path layout dummy node

    @MatPont
    MatPont committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    028d6be View commit details
    Browse the repository at this point in the history

  3. [MergeTreeVisu] path planar layout shift according lowest node

    @MatPont
    MatPont committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    df0b6b6 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2023

  1. [MergeTreeVisu] fix y dimension shift for 1 barycenter and 2 trees

    @MatPont
    MatPont committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    8b35190 View commit details
    Browse the repository at this point in the history

  2. [MergeTreeBarycenter] remove unused variable

    @MatPont
    MatPont committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    9e9bb56 View commit details
    Browse the repository at this point in the history

  3. [MergeTreeVisu] work on trees layout alignment given barycenter

    @MatPont
    MatPont committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    22c300a View commit details
    Browse the repository at this point in the history

  4. [MergeTreeVisu] work on special cases of tree planar layout alignment… 

    … to barycenter
    @MatPont
    MatPont committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    e6f5648 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2023

  1. temporal reduction working for path mappings

    @floWetzels
    floWetzels committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    f0d4902 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2023

  1. Merge branch 'mapping_planar_layout' of https://github.com/MatPont/ttk … 

    …into bdi-ed_clustering
    @floWetzels
    floWetzels committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    ea2fd47 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2023

  1. added some debugging and testing options to MergeTreeClustering

    @floWetzels
    floWetzels committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    ef248d6 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2023

  1. [MergeTreeVisu] fix dummy nodes and cells

    @MatPont
    MatPont committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    147ab25 View commit details
    Browse the repository at this point in the history

  2. [MT-AE] work on path layout points and cells data

    @MatPont
    MatPont committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    52de908 View commit details
    Browse the repository at this point in the history

  3. Added path mapping output to vtk layer of MergeTreeClustering

    @floWetzels
    floWetzels committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    1381082 View commit details
    Browse the repository at this point in the history

  4. [MergeTreeVisu] path ids first version

    @MatPont
    MatPont committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    d05943d View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2023

  1. [MergeTreeVisu] fix path layout seg fault for Wasserstein distance

    @MatPont
    MatPont committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    0ca7d80 View commit details
    Browse the repository at this point in the history

  2. [MergeTreeVisu] disable barycenter alignment for Wasserstein distance

    @MatPont
    MatPont committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    aedc5cf View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2023

  1. [MergeTreeVisu] true node ids in matching

    @MatPont
    MatPont committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    51e4d6a View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2023

  1. lots of changes on merge tree barycenter (mostly outputs for testing)

    @floWetzels
    floWetzels committed Mar 31, 2023
    Configuration menu
    Copy the full SHA
    d60777b View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2024

  1. fixed merge conflicts

    @floWetzels
    floWetzels committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    b9f71cf View commit details
    Browse the repository at this point in the history

Commits on Feb 29, 2024

  1. started work on preprecessing for path mappings

    @floWetzels
    floWetzels committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    f3fc3b0 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2024

  1. preprocessing working for path mapping distance in clustering module

    @floWetzels
    floWetzels committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    e0c4ad8 View commit details
    Browse the repository at this point in the history

  2. started work on path mapping preprocessing for remaing modules

    @floWetzels
    floWetzels committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    177451b View commit details
    Browse the repository at this point in the history

  3. path mapping preprocessing working for clustering with multiple clusters

    @floWetzels
    floWetzels committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    837f881 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2024

  1. preprocessing working for single path/branch mapping distance

    @floWetzels
    floWetzels committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    66622a3 View commit details
    Browse the repository at this point in the history

  2. renaming of path/branch mapping API

    @floWetzels
    floWetzels committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    4ae6cf9 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2024

  1. preprocessing for path/branch mappings working in MergeTreeDistanceMa… 

    …trix
    @floWetzels
    floWetzels committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    e2d0a6b View commit details
    Browse the repository at this point in the history

  2. parallel computation for path/branch mapping distance in MergeTreeist… 

    …anceMatrix
    @floWetzels
    floWetzels committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    c32a75e View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2024

  1. Parallel assignment for path mapping distance in MergeTreeBarycenter

    @floWetzels
    floWetzels committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    ff08b2d View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2024

  1. added iteration limit for merge tree barycenter again

    @floWetzels
    floWetzels committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    8a8507b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' of https://github.com/topology-tool-kit/ttk into p… 

    …ath-mapping-preprocessing
    @floWetzels
    floWetzels committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    dcd0798 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. removed convergence flag in MergeTreeBarycenter and allowed unlimited… 

    … iterations through negative iterationLimit flag
    @floWetzels
    floWetzels committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    4205c37 View commit details
    Browse the repository at this point in the history

  2. improved preprocessing in MergeTreeDistanceMatrix

    @floWetzels
    floWetzels committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    0783878 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2024

  1. updated authors and publications in all edit distance related modules

    @floWetzels
    floWetzels committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    0875770 View commit details
    Browse the repository at this point in the history

  2. clang-format

    @floWetzels
    floWetzels committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    27de87e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' of https://github.com/topology-tool-kit/ttk into p… 

    …ath-mapping-preprocessing
    @floWetzels
    floWetzels committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    630cca2 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2024

  1. compiler warnings

    @floWetzels
    floWetzels committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    1abf1e1 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2024

  1. [MergeTreeClustering] filter backends and options

    @MatPont
    MatPont committed May 2, 2024
    Configuration menu
    Copy the full SHA
    9cccc23 View commit details
    Browse the repository at this point in the history

  2. [MergeTreeClustering] fix compute barycenter option caching with edit… 

    … distance
    @MatPont
    MatPont committed May 2, 2024
    Configuration menu
    Copy the full SHA
    70547be View commit details
    Browse the repository at this point in the history

  3. [MergeTreeClustering] fix barycenter dbug level when called in cluste… 

    …ring
    @MatPont
    MatPont committed May 2, 2024
    Configuration menu
    Copy the full SHA
    2c63c97 View commit details
    Browse the repository at this point in the history

  4. [MergeTreeClustering] fix xml conditions for barycenter options

    @MatPont
    MatPont committed May 2, 2024
    Configuration menu
    Copy the full SHA
    a3c1515 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. fixed inverted squared-parameter in MergeTreeDistanceMatrix

    @floWetzels
    floWetzels committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    ccfe1f3 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2024

  1. fixed cost array in matching output of MergeTreeClustering when using… 

    … the path mapping distance
    @floWetzels
    floWetzels committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    85142bc View commit details
    Browse the repository at this point in the history

  2. fixed cost array in mapping output for branch mapping distance

    @floWetzels
    floWetzels committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    18d6307 View commit details
    Browse the repository at this point in the history

  3. clang format

    @floWetzels
    floWetzels committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    225e6e9 View commit details
    Browse the repository at this point in the history

  4. removed old code and fixed some warnings

    @floWetzels
    floWetzels committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    b83a149 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2024

  1. [MergeTreeClustering] compute barycenter option caching

    @MatPont
    MatPont committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    13ee09f View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2024

  1. [MergeTree] xml doc

    @MatPont
    MatPont committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    74764b1 View commit details
    Browse the repository at this point in the history