Code

Optimize multi-tree comparisons#59

Code

Draft

ms609 wants to merge 83 commits intomasterms609/TreeDist:masterfrom optimms609/TreeDist:optimCopy head branch name to clipboard

+1,356-19

Commits

Commits on Jul 19, 2021

• pre-increment

  

  Martin Smith

  committed
  e5c21ea

• Header guards

  

  Martin Smith

  committed
  c56b4ab

• alpha

  

  Martin Smith

  committed
  daeb1d7

• start work on cpp_all_pairs_mci()

  

  Martin Smith

  committed
  530f43a

• Constructing tournament tree

  

  Martin Smith

  committed
  1a73ebd

• Play first games

  

  Martin Smith

  committed
  2bbd1b5

Commits on Jul 20, 2021

• Test for equality at end

  

  Martin Smith

  committed
  cc459a9

• File reorganization

  

  Martin Smith

  committed
  79ddbf6

• .h → .hpp

  

  Martin Smith

  committed
  99f7ec8

• Initialize SplitRoster()

  

  Martin Smith

  committed
  210db89

• int32s

  

  Martin Smith

  committed
  4f77795

• Log splits

  

  Martin Smith

  committed
  fc86ba2

• Tournament implementation

  

  Martin Smith

  committed
  2e02e24

• Save winners & losers

  

  Martin Smith

  committed
  b1d0276

• Simplify

  

  Martin Smith

  committed
  06bae67

• .hpp

  

  Martin Smith

  committed
  f1228cd

• Declarations

  

  Martin Smith

  committed
  e9061b8

• vector of arrays

  

  Martin Smith

  committed
  2c1d60d

• in_split is int16

  

  Martin Smith

  committed
  36a0ccf

• types

  

  Martin Smith

  committed
  33ded8f

• index format

  

  Martin Smith

  committed
  8724fff

• hpp

  

  Martin Smith

  committed
  7659349

• std::vector<SplitList> splits

  

  Martin Smith

  committed
  97d4c40

• hpp

  

  Martin Smith

  committed
  7de40cd

• Correct assertions

  

  Martin Smith

  committed
  18cd5d3

• emplace_back takes params only

  

  Martin Smith

  committed
  fa24471

• mvoe up

  

  Martin Smith

  committed
  0eff372

• begin cpp_all_pairs_mci

  

  Martin Smith

  committed
  193f19e

Commits on Jul 21, 2021

• Framework for self-comparison

  

  Martin Smith

  committed
  35248fd

• Draft of score_pairs()

  

  Martin Smith

  committed
  caa1761

• Draft ready to debug?

  

  Martin Smith

  committed
  7bda05c

• Update tree_distances.cpp

  

  Martin Smith

  committed
  0b23a33

• Merge branch 'master' into optim

  

  Martin Smith

  committed
  41019ec

• return

  

  Martin Smith

  committed
  6cf0c20

• parent/child offset

  

  Martin Smith

  committed
  0071672

• Debug

  

  Martin Smith

  committed
  cb030ae

• new_split

  

  Martin Smith

  committed
  6badf49

• SplitList(RawMatrix x, int16 n_tip);

  

  Martin Smith

  committed
  7b04587

• //

  

  Martin Smith

  committed
  3a375b2

• #define

  

  Martin Smith

  committed
  31942d4

• leaves

  

  Martin Smith

  committed
  4303722

• , n_tips

  

  Martin Smith

  committed
  8db011d

• na/nA switch

  

  Martin Smith

  committed
  4284859

• li

  

  Martin Smith

  committed
  6e0979d

• sp_i/j

  

  Martin Smith

  committed
  94d2e46

• max-/

  

  Martin Smith

  committed
  9b578b6

• max lookip

  

  Martin Smith

  committed
  6a77b28

• n_trees - 1

  

  Martin Smith

  committed
  ab9287a

• Swap in_split

  

  Martin Smith

  committed
  5f79c9a

• nA, na

  

  Martin Smith

  committed
  f435292

• n_tips

  

  Martin Smith

  committed
  d6106eb

• Working for 9 leaves

  

  Martin Smith

  committed
  9f4e429

• //

  

  Martin Smith

  committed
  38af2d7

Commits on Jul 22, 2021

• * Use MACROS for SplitList(x)

  

  Martin Smith

  committed
  4a324f9

• i = winner + tournament_games

  

  Martin Smith

  committed
  dd41e88

• Update SplitRoster.cpp

  

  Martin Smith

  committed
  b4bbe22

• pow → <<

  

  Martin Smith

  committed
  20b4e21

• Full bin

  

  Martin Smith

  committed
  3a89e51

• Update SplitList.cpp

  

  Martin Smith

  committed
  8ba32e1

• index for 0!

  

  Martin Smith

  committed
  91536f9

• Debugging comments

  

  Martin Smith

  committed
  d3482ce

• INBIN not INSUBBIN

  

  Martin Smith

  committed
  0ff8fc8

• assert(fuzzy_match < lap_dim);

  

  Martin Smith

  committed
  49125ae

• Merge branch 'master' into optim

  

  Martin Smith

  committed
  8f7e92c

• Merge branch 'master' into optim

  

  Martin Smith

  committed
  dfdf4eb

• Update SplitList.cpp

  

  Martin Smith

  committed
  4d1e955

• Improve comment

  

  Martin Smith

  committed
  af3a9c9

• ws

  

  Martin Smith

  committed
  5d5c04f

• ai:→ roster_len

  

  Martin Smith

  committed
  5adb89a

• Drop TR1 reference

  

  Martin Smith

  committed
  ec0d493

• .hpp→.h

  Show description for f38abdc
  

  Martin Smith

  committed
  f38abdc

• .hpp→.h

  

  Martin Smith

  committed
  9649ec2

• .hpp→.h

  

  Martin Smith

  committed
  a44e205

• .hpp→.h

  

  Martin Smith

  committed
  9b5f61f

• Don't calculate self-similarity

  

  Martin Smith

  committed
  a6edeb4

• spell 'dist'

  

  Martin Smith

  committed
  0ba89d7

• // entry++

  

  Martin Smith

  committed
  c1ee964

• Populate spare j-splits

  

  Martin Smith

  committed
  2437e8d

• spacing

  

  Martin Smith

  committed
  aed65a4

• don't invert

  

  Martin Smith

  committed
  201dc8e

• consts → #defines

  

  Martin Smith

  committed
  c23662d

• use memory once

  

  Martin Smith

  committed
  823bf06

• ws

  

  Martin Smith

  committed
  67c90ad