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.

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

Update makeplots #95

Merged
merged 3 commits into from
Sep 11, 2024
Merged

Update makeplots #95

merged 3 commits into from
Sep 11, 2024

Conversation

micchu
Copy link
Member

@micchu micchu commented Sep 9, 2024

makeplots2 をアップロードしました.

  • plotのサブ関数群を更新
    • 現在ほぼ使用されていないと見られる __plot_paired_violin, __plot_swarm, __plot_box を削除
    • 代わりに新たに __plot_line を追加
    • __plot_bar を seaborn を使用する記述に変更
    • 全てのplotサブ関数について,dataframeでデータを引き取るように修正し,legend_handlerを返り値に持つようにインタフェースを共通化
    • plotサブ関数ごとに配色のルールがバラバラだったのを共通化
  • makeplots2 本体を更新
    • 個々の plot のサブ関数に依存する引数は makeplots_kws で引き取るように変更
      • これにより以前とmakeplotsのインタフェースが変わるため,makeplots ではなく makeplots2 という名前の関数として追加した次第
    • 全ての plot サブ関数に dataframe を渡すように更新
    • __strict_data と __weird_form_to_long のみを使用することになり,__get_data は対象データがなくなったため削除
    • legend の処理が plot_type によって異なっていたのを一本化
    • plot_type="original" を追加し,plot_func の引数独自のplotサブ関数を渡せるように変更

@ShuntaroAoki ShuntaroAoki changed the base branch from main to dev September 9, 2024 14:27
@ShuntaroAoki ShuntaroAoki self-requested a review September 9, 2024 14:38
bdpy/fig/makeplots2.py Outdated Show resolved Hide resolved
Copy link

github-actions bot commented Sep 10, 2024

Coverage

Coverage Report
FileStmtsMissCoverMissing
bdpy/bdata
   bdata.py39919551%79, 104, 109, 113, 118, 122, 132–134, 190, 233–239, 252–262, 276–277, 310, 314, 318–356, 405–411, 419–420, 425–426, 443–450, 468–469, 475, 508, 539, 548, 560, 589–598, 610, 625, 661, 683–691, 696–729, 738, 750–757, 761–767, 771–799, 803–824, 828–862, 866–868, 872–874, 878–887
   featureselector.py641281%62–67, 69–74
   metadata.py67199%84
   utils.py1133767%71, 82, 85–86, 95, 127–173, 201, 246, 258, 263
bdpy/dataform
   datastore.py1078521%59–75, 90–93, 97–98, 102–113, 116–119, 122–127, 131–132, 137–158, 190–197, 222–259, 262–265
   features.py29816545%31–32, 43–46, 90–92, 101–103, 107, 111, 115, 119, 152–153, 157–161, 168–197, 214–215, 224–225, 232–236, 274, 288, 305–319, 323, 327, 331, 335, 339, 343, 347, 351, 355, 359, 364–394, 398–418, 422–462, 465, 470–477, 491–493, 496–499, 502–505, 508–512, 515–516, 536–549
   kvs.py1771393%21, 24, 114, 118, 127–131, 171, 173, 185, 254, 282
   pd.py9544%25–27, 43–44
   sparse.py67790%29, 52–58, 74, 109, 123
   utils.py12120%3–18
bdpy/dataset
   utils.py45450%3–98
bdpy/distcomp
   distcomp.py921880%33, 35, 49, 53, 55, 66–70, 74, 76, 81–82, 89–93, 97
bdpy/dl
   caffe.py60600%4–129
bdpy/dl/torch
   base.py432444%31–41, 48, 54, 60, 63, 73–83, 90, 96, 102, 105
   dataset.py74740%1–195
   models.py33322632%148–169, 297–316, 327–331, 345–350, 442–494, 515–517, 528–587, 611–614, 625–684, 708–711, 722–771, 790–793, 804–853, 872–875
   torch.py1215555%188–225, 228, 231–243, 246–281
bdpy/dl/torch/domain
   core.py46296%47, 63
   feature_domain.py24196%30
   image_domain.py64198%179
bdpy/evals
   metrics.py954553%49–53, 82–112, 130–142, 151–152, 157, 172–179
bdpy/feature
   feature.py30293%69–70
bdpy/fig
   __init__.py550%6–10
   draw_group_image_set.py90900%3–182
   fig.py88880%16–164
   makeplots2.py2572570%1–602
   makeplots.py3363360%1–729
   tile_images.py59590%1–193
bdpy/ml
   crossvalidation.py592754%47–48, 113–114, 117–118, 138, 164–196
   learning.py3119669%43–44, 48, 52, 59, 91–104, 109–125, 128, 158–170, 184–209, 293, 309, 313–315, 318–319, 329, 339–340, 345–346, 356–364, 367–368, 376, 411–418, 439, 452, 460, 469, 501–503, 542, 555, 558, 567, 576, 581, 602
   model.py14012014%29–39, 54–70, 86–144, 156–169, 184–222, 225, 230–250, 254–258, 271–285
   searchlight.py161319%32–51
bdpy/mri
   fmriprep.py4974519%25–34, 38, 44–62, 65–75, 78–89, 92–160, 163–194, 230–360, 367–380, 384, 388–390, 394, 398–400, 410–434, 437–454, 457–464, 471–472, 475–491, 494, 498, 502–815, 819–831, 842–862
   glm.py403610%46–95
   image.py241921%29–54
   load_epi.py281836%36–50, 56–63, 82–88
   load_mri.py191616%16–36
   roi.py24821712%37–100, 165–235, 241–314, 320–387, 399–466, 473–499
   spm.py15813912%26–155, 162–166, 170, 174–179, 183–300
bdpy/opendata
   __init__.py110%1
   openneuro.py2102100%1–329
bdpy/pipeline
   config.py36294%37–38
bdpy/preproc
   interface.py521669%111–123, 148–157
   preprocessor.py1296947%35, 44, 112–114, 121–128, 138–189, 196–227
   select_top.py23196%55
bdpy/recon
   utils.py55550%4–146
bdpy/recon/torch
   icnn.py1611610%15–478
bdpy/recon/torch/modules
   critic.py44295%58, 132
   encoder.py29197%29
   generator.py72593%47, 52, 68, 128, 309
   latent.py34391%16, 21, 32
bdpy/recon/torch/task
   inversion.py831088%19, 37, 42, 47, 54, 59, 64, 69, 93, 207
bdpy/stats
   corr.py43393%57, 68, 102
bdpy/task
   callback.py71494%114, 161, 166, 234
   core.py16194%50
bdpy/util
   info.py473623%19–79
   utils.py36878%60, 116–121, 140–142
TOTAL5943366038% 

Tests Skipped Failures Errors Time
204 0 💤 0 ❌ 0 🔥 18.096s ⏱️

@ShuntaroAoki ShuntaroAoki merged commit 31c2052 into dev Sep 11, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants