Code

[REF] Decision tree modularization#592

Code

Closed

tsalo wants to merge 91 commits intoME-ICA:mainME-ICA/tedana:mainfrom handwerkerd:DecisionTreeModularizationhandwerkerd/tedana:DecisionTreeModularizationCopy head branch name to clipboard

+3,739-27

Commits

Commits on Nov 6, 2019

• Adds integration and five echo skipping

  jbteves

  committed
  13a54d4

  Copy full SHA for 13a54d4

• Style fixes

  jbteves

  committed
  1bb1f18

  Copy full SHA for 1bb1f18

• Updates config for CircleCI

  jbteves

  committed
  08069d4

  Copy full SHA for 08069d4

• Merge remote-tracking branch 'upstream/master' into feature/pytest_skip_integration

  jbteves

  committed
  3f50216

  Copy full SHA for 3f50216

• Attempts to fix YML

  jbteves

  committed
  067ac2b

  Copy full SHA for 067ac2b

• [TEST] Update Dockerfile to match new integr tests

  rmarkello

  committed
  888de0f

  Copy full SHA for 888de0f

• [TEST] Fixes integration tests in Docker image

  rmarkello

  committed
  7209897

  Copy full SHA for 7209897

• [FIX] Remove intermediate IO files

  rmarkello

  committed
  5d2b65a

  Copy full SHA for 5d2b65a

• Resolves merge conflict, adds output check

  jbteves

  committed
  df6261f

  Copy full SHA for df6261f

• Some fixes

  jbteves

  committed
  2210aa7

  Copy full SHA for 2210aa7

Commits on Nov 7, 2019

• [TEST] Updates dev_tool testing infra

  rmarkello

  committed
  efd9e7a

  Copy full SHA for efd9e7a

• [TEST] Fixes pytest integration path checking

  rmarkello

  committed
  494bc63

  Copy full SHA for 494bc63

• [TEST] CircleCI uses Docker image to run tests

  rmarkello

  committed
  95dffda

  Copy full SHA for 95dffda

• [FIX] Minor dev_tool issues for CircleCI

  rmarkello

  committed
  3b966fa

  Copy full SHA for 3b966fa

• [TEST] Use variable for integration test filename

  rmarkello

  committed
  796a0d2

  Copy full SHA for 796a0d2

• Attempts to fix CircleCI style check

  jbteves

  committed
  769f4b7

  Copy full SHA for 769f4b7

• Merge remote-tracking branch 'origin/feature/pytest_skip_integration' into feature/pytest_skip_integration

  jbteves

  committed
  a4e17a8

  Copy full SHA for a4e17a8

• Revert "Attempts to fix CircleCI style check"

  Show description for 08a3ce3
  jbteves

  committed
  08a3ce3

  Copy full SHA for 08a3ce3

• Attempt to fix tput call

  jbteves

  committed
  8769d0b

  Copy full SHA for 8769d0b

• Adds checkout to code in YML

  jbteves

  committed
  20086cb

  Copy full SHA for 20086cb

• [TEST] Integration tests run in parallel

  rmarkello

  committed
  3b1f4f6

  Copy full SHA for 3b1f4f6

• [TEST] Separate data downloads from Docker build

  rmarkello

  committed
  86b0a9b

  Copy full SHA for 86b0a9b

• [TEST] Update integration test data path

  rmarkello

  committed
  17ce437

  Copy full SHA for 17ce437

• [TEST] CircleCI uses good Docker

  rmarkello

  committed
  0226e03

  Copy full SHA for 0226e03

• [TEST] No version check in circleci

  rmarkello

  committed
  39fdae1

  Copy full SHA for 39fdae1

• [TEST] Checkout for get_data / style check

  rmarkello

  committed
  07e18e5

  Copy full SHA for 07e18e5

• Attempts to fix integration test inclusion

  jbteves

  committed
  2ab23bd

  Copy full SHA for 2ab23bd

• Merge remote-tracking branch 'origin/feature/pytest_skip_integration' into feature/pytest_skip_integration

  jbteves

  committed
  31b790a

  Copy full SHA for 31b790a

• [TEST] Checkout for get_data / style check

  rmarkello

  committed
  74551a0

  Copy full SHA for 74551a0

• [FIX] Fix circleci config hopefully

  rmarkello

  committed
  a129019

  Copy full SHA for a129019

• [FIX] No / workdir for circleci machine

  rmarkello

  committed
  9b59794

  Copy full SHA for 9b59794

• [FIX] Use ~ for coverage in circleci

  rmarkello

  committed
  2301850

  Copy full SHA for 2301850

• Switches integration tests to truncated length data

  jbteves

  committed
  fa6d176

  Copy full SHA for fa6d176

• Attempts to resolve merge conflict

  jbteves

  committed
  ef99664

  Copy full SHA for ef99664

• [FIX] Actually merge coverage files

  rmarkello

  committed
  24d4056

  Copy full SHA for 24d4056

• Set up decison tree modular framework

  handwerkerd

  committed
  648e681

  Copy full SHA for 648e681

• Full decision modularization pre classes

  handwerkerd

  committed
  83f830b

  Copy full SHA for 83f830b

• make lint fixes

  handwerkerd

  committed
  5808407

  Copy full SHA for 5808407

• [FIX] style errors

  handwerkerd

  committed
  ec4450e

  Copy full SHA for ec4450e

Commits on Nov 8, 2019

• Reorganize metrics.

  tsalo

  committed
  57f95f1

  Copy full SHA for 57f95f1

• Merge remote-tracking branch 'ME-ICA/master' into modularize-metrics

  tsalo

  committed
  2a27d7d

  Copy full SHA for 2a27d7d

• Some more work on organizing metrics.

  tsalo

  committed
  7e136e8

  Copy full SHA for 7e136e8

• Add signal_minus_noise_z metric.

  tsalo

  committed
  aae8a94

  Copy full SHA for aae8a94

• Variable name change.

  tsalo

  committed
  cca8d55

  Copy full SHA for cca8d55

• Set up json and general structure for dtree class

  handwerkerd

  committed
  8970805

  Copy full SHA for 8970805

• fixed minor omission in selection_nodes

  handwerkerd

  committed
  2b5263f

  Copy full SHA for 2b5263f

• Move comptable.

  tsalo

  committed
  2a78cb9

  Copy full SHA for 2a78cb9

• Move T2* cap into decay function.

  tsalo

  committed
  02c377d

  Copy full SHA for 02c377d

• Merge remote-tracking branch 'ME-ICA/master' into modularize-metrics

  tsalo

  committed
  66b8726

  Copy full SHA for 66b8726

• Split up metric files.

  tsalo

  committed
  a175191

  Copy full SHA for a175191

Commits on Nov 9, 2019

• Adjust cluster-extent thresholding to match across maps.

  tsalo

  committed
  870207e

  Copy full SHA for 870207e

Commits on Nov 10, 2019

• Partially address review.

  Show description for 6793694
  tsalo

  committed
  6793694

  Copy full SHA for 6793694

• Make DICE broadcastable.

  tsalo

  committed
  21db69a

  Copy full SHA for 21db69a

• Clean up signal-noise metrics and fix compute_countnoise.

  tsalo

  committed
  9a968e1

  Copy full SHA for 9a968e1

• Simplify calculate_z_maps.

  tsalo

  committed
  c49ac58

  Copy full SHA for c49ac58

• Fix dice (thanks @rmarkello)

  tsalo

  committed
  710fe1b

  Copy full SHA for 710fe1b

Commits on Nov 12, 2019

• Adding more decision nodes

  handwerkerd

  committed
  ad0eeb8

  Copy full SHA for ad0eeb8

• Improve documentation.

  tsalo

  committed
  739593e

  Copy full SHA for 739593e

• Fix import.

  tsalo

  committed
  f6ffc0e

  Copy full SHA for f6ffc0e

• Fix imports.

  tsalo

  committed
  5f5ad40

  Copy full SHA for 5f5ad40

Commits on Nov 13, 2019

• [ENH,FIX] Fixing decision tree workflow

  rmarkello

  committed
  1e42112

  Copy full SHA for 1e42112

• Merge pull request #1 from rmarkello/DecisionTreeModularization

  Show description for 409f647
  handwerkerd

  authored
  409f647

  Copy full SHA for 409f647

• DecisionTree running until bugs node functions

  handwerkerd

  committed
  459f75c

  Copy full SHA for 459f75c

Commits on Nov 14, 2019

• A complete but buggy full minimum decision tree

  handwerkerd

  committed
  ec2dbcb

  Copy full SHA for ec2dbcb

Commits on Nov 15, 2019

• decision tree through midk

  handwerkerd

  committed
  e061e77

  Copy full SHA for e061e77

• added classification_exists and tweaked inputs

  handwerkerd

  committed
  aa99bbf

  Copy full SHA for aa99bbf

• Get modularized metrics mostly working.

  tsalo

  committed
  44712f0

  Copy full SHA for 44712f0

• Merge remote-tracking branch 'ME-ICA/master' into modularize-metrics

  tsalo

  committed
  51909b8

  Copy full SHA for 51909b8

• HORRIFYING MERGE COMMIT (see Josh for blame)

  handwerkerd

  committed
  053c9e8

  Copy full SHA for 053c9e8

Commits on Nov 17, 2019

• added low var, high meanmetricrank, high kappa node

  handwerkerd

  committed
  0911bd4

  Copy full SHA for 0911bd4

• Fix bugs in metric calculations.

  Show description for 3bb00c7
  tsalo

  committed
  3bb00c7

  Copy full SHA for 3bb00c7

• Revert changes to decision tree.

  tsalo

  committed
  dfd0ba7

  Copy full SHA for dfd0ba7

• Finish reverting.

  tsalo

  committed
  41c9a8b

  Copy full SHA for 41c9a8b

• Fix viz.

  tsalo

  committed
  5815a93

  Copy full SHA for 5815a93

• Fix style issues

  tsalo

  committed
  6483cf7

  Copy full SHA for 6483cf7

• More???

  tsalo

  committed
  db5caac

  Copy full SHA for db5caac

Commits on Nov 18, 2019

• Fix bug in generate_metrics.

  tsalo

  committed
  f02d9f3

  Copy full SHA for f02d9f3

• Add initial tests.

  tsalo

  committed
  4e9a020

  Copy full SHA for 4e9a020

• Improve docstrings, add shape checks, and reorder functions.

  tsalo

  committed
  f5ab022

  Copy full SHA for f5ab022

• Fix assertions.

  tsalo

  committed
  96de3df

  Copy full SHA for 96de3df

• Fix style issue.

  tsalo

  committed
  17c9949

  Copy full SHA for 17c9949

• Merge branch 'master' into modularize-metrics

  tsalo

  authored
  b281367

  Copy full SHA for b281367

• Add metric submodules to API docs.

  tsalo

  committed
  23c682d

  Copy full SHA for 23c682d

Commits on Nov 20, 2019

• finished buggy full decision tree

  handwerkerd

  committed
  7b4ea01

  Copy full SHA for 7b4ea01

• Merge remote-tracking branch 'ME-ICA/master' into modularize-metrics

  tsalo

  committed
  9ea1ab2

  Copy full SHA for 9ea1ab2

• Merge branch 'modularize-metrics' into DecisionTreeModularization

  Show description for 39b611c
  handwerkerd

  committed
  39b611c

  Copy full SHA for 39b611c

Commits on Nov 22, 2019

• [REF] Modularize metric calculation (ME-ICA#447)

  Show description for 913cd4c
  

  tsalo

  authored and

  handwerkerd

  committed
  913cd4c

  Copy full SHA for 913cd4c

• Merge to 'upstream/ref/decision-tree'

  handwerkerd

  committed
  7afac29

  Copy full SHA for 7afac29

• Deleted intermediate unused files

  handwerkerd

  committed
  aaad8be

  Copy full SHA for aaad8be

Commits on Nov 25, 2019

• Added user inputted paths for decision tree json

  handwerkerd

  committed
  2cce93a

  Copy full SHA for 2cce93a

Commits on Dec 2, 2019

• improving RTD for decision tree modulation

  handwerkerd

  committed
  c629cee

  Copy full SHA for c629cee