TreeSAK 1.34.8__tar.gz → 1.35.0__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (99) hide show
  1. {TreeSAK-1.34.8/TreeSAK.egg-info → TreeSAK-1.35.0}/PKG-INFO +2 -2
  2. TreeSAK-1.35.0/TreeSAK/AssessPB.py +92 -0
  3. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/VERSION +4 -1
  4. {TreeSAK-1.34.8 → TreeSAK-1.35.0/TreeSAK.egg-info}/PKG-INFO +2 -2
  5. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK.egg-info/SOURCES.txt +1 -0
  6. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/bin/TreeSAK +14 -0
  7. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/LICENSE +0 -0
  8. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/MANIFEST.in +0 -0
  9. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/README.md +0 -0
  10. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/ALE.py +0 -0
  11. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/ALE1.py +0 -0
  12. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/ALE2.py +0 -0
  13. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/ALE2RTC.py +0 -0
  14. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/ALE3.py +0 -0
  15. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/ALE4.py +0 -0
  16. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/ALE5.py +0 -0
  17. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/ALE6.py +0 -0
  18. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/ALE_backup.py +0 -0
  19. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/AlignmentPruner.py +0 -0
  20. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/AssessCVG.py +0 -0
  21. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/AssessMarker.py +0 -0
  22. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/AssessMarkerDeltaLL.py +0 -0
  23. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/AssessMarkerPA.py +0 -0
  24. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/BMGE.jar +0 -0
  25. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/BMGE.py +0 -0
  26. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/CompareMCMC.py +0 -0
  27. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/ConcateMSA.py +0 -0
  28. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/ConvertMSA.py +0 -0
  29. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/Dir.rb +0 -0
  30. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/ExtractMarkerSeq.py +0 -0
  31. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/FastRoot.py +0 -0
  32. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/FastRoot_backup.py +0 -0
  33. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/GTDB_tree.py +0 -0
  34. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/KEGG_Luo17.py +0 -0
  35. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/LcaToLeaves.py +0 -0
  36. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/MCMCtreeR.py +0 -0
  37. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/MarkerRef2Tree.py +0 -0
  38. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/MarkerRef2Tree_backup.py +0 -0
  39. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/MarkerSeq2Tree.py +0 -0
  40. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/ModifyTopo.py +0 -0
  41. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/OMA.py +0 -0
  42. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/OMA2.py +0 -0
  43. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/OneLineAln.py +0 -0
  44. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/PB.py +0 -0
  45. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/PMSF.py +0 -0
  46. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/PhyloBiAssoc.R +0 -0
  47. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/PhyloBiAssoc.py +0 -0
  48. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/PlotMcmcNode.py +0 -0
  49. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/RootTree.py +0 -0
  50. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/RootTreeGTDB214.py +0 -0
  51. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/RootTreeGTDB220.py +0 -0
  52. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/SequentialDating.py +0 -0
  53. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/SingleAleHGT.py +0 -0
  54. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/SingleLinePhy.py +0 -0
  55. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/SliceMSA.py +0 -0
  56. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/SplitScore.py +0 -0
  57. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/SplitScore1.py +0 -0
  58. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/SplitScore1OMA.py +0 -0
  59. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/SplitScore2.py +0 -0
  60. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/TaxaCountStats.R +0 -0
  61. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/TreeSAK_config.py +0 -0
  62. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/VisHPD95.R +0 -0
  63. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/VisHPD95.py +0 -0
  64. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/__init__.py +0 -0
  65. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/ale_parser.py +0 -0
  66. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/ale_splitter.py +0 -0
  67. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/compare_trees.R +0 -0
  68. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/compare_trees.py +0 -0
  69. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/dating.py +0 -0
  70. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/dating_ss.py +0 -0
  71. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/do_rrtc.rb +0 -0
  72. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/fa2phy.py +0 -0
  73. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/format_leaf_name.py +0 -0
  74. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/get_arCOG_seq.py +0 -0
  75. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/global_functions.py +0 -0
  76. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/merge_pdf.py +0 -0
  77. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/pRTC.py +0 -0
  78. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/parse_deltall_stdout.py +0 -0
  79. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/plot_distruibution_th.py +0 -0
  80. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/prep_mcmctree_ctl.py +0 -0
  81. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/print_leaves.py +0 -0
  82. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/rename_leaves.py +0 -0
  83. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/replace_clade.py +0 -0
  84. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/root_with_out_group.py +0 -0
  85. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/run_TaxaCountStats_R_s1.py +0 -0
  86. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/subsample_drep_gnms.py +0 -0
  87. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/subset.py +0 -0
  88. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/subset_tree_stupid_old_way.py +0 -0
  89. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/test_1.py +0 -0
  90. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/test_2.py +0 -0
  91. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/tmp_2.py +0 -0
  92. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/tmp_3.py +0 -0
  93. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/tmp_4.py +0 -0
  94. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK/weighted_rand.rb +0 -0
  95. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK.egg-info/dependency_links.txt +0 -0
  96. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK.egg-info/requires.txt +0 -0
  97. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/TreeSAK.egg-info/top_level.txt +0 -0
  98. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/setup.cfg +0 -0
  99. {TreeSAK-1.34.8 → TreeSAK-1.35.0}/setup.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: TreeSAK
3
- Version: 1.34.8
3
+ Version: 1.35.0
4
4
  Summary: BioSAK
5
5
  Home-page: https://github.com/songweizhi/TreeSAK
6
6
  Author: Weizhi Song
@@ -24,4 +24,4 @@ Requires-Dist: kaleido
24
24
  Requires-Dist: PyPDF3
25
25
  Requires-Dist: dendropy
26
26
 
27
- TreeSAK v1.34.8
27
+ TreeSAK v1.35.0
@@ -0,0 +1,92 @@
1
+ import os
2
+ import argparse
3
+
4
+
5
+ AssessPB_usage = '''
6
+ ================= AssessPB example commands =================
7
+
8
+ # Dependency: bpcomp and tracecomp (from PhyloBayes-MPI)
9
+
10
+ export OMPI_MCA_btl=^openib
11
+ TreeSAK AssessPB -c1 chain_1 -c2 chain_2
12
+ TreeSAK AssessPB -cdir chain_folder
13
+
14
+ # This is a wrapper for:
15
+ bpcomp -x 1000 10 chain1 chain2
16
+ tracecomp -x 1000 chain1 chain2
17
+
18
+ =============================================================
19
+ '''
20
+
21
+
22
+ def compare2chains(chain_1, chain_2, burn_in, sample_interval, with_bpcomp, with_tracecomp, op_dir, cmd_txt):
23
+
24
+ # bpcomp: -x <burnin> [<every> <until>]. default burnin = 10 percent of the chain
25
+ # tracecomp: -x <burnin> [<every> <until>]. default burnin = 20 percent of the chain
26
+
27
+ bpcomp_cmd = 'bpcomp -o %s/bpcomp -x %s %s %s %s' % (op_dir, burn_in, sample_interval, chain_1, chain_2)
28
+ tracecomp_cmd = 'tracecomp -o %s/tracecomp -x %s %s %s' % (op_dir, burn_in, chain_1, chain_2)
29
+
30
+ cmd_txt_handle = open(cmd_txt, 'a')
31
+
32
+ if with_bpcomp is True:
33
+ cmd_txt_handle.write(bpcomp_cmd + '\n')
34
+ os.system(bpcomp_cmd)
35
+
36
+ if with_tracecomp is True:
37
+ cmd_txt_handle.write(tracecomp_cmd + '\n')
38
+ os.system(tracecomp_cmd)
39
+
40
+ cmd_txt_handle.close()
41
+
42
+
43
+ def AssessPB(args):
44
+
45
+ chain_1 = args['c1']
46
+ chain_2 = args['c2']
47
+ chain_dir = args['cdir']
48
+ burn_in = args['bi']
49
+ sample_interval = args['si']
50
+ op_dir = args['o']
51
+ force_overwrite = args['f']
52
+ with_bpcomp = True
53
+ with_tracecomp = True
54
+
55
+ cmd_txt = '%s/cmds.txt' % op_dir
56
+
57
+ # create output dir
58
+ if os.path.isdir(op_dir) is True:
59
+ if force_overwrite is True:
60
+ os.system('rm -r %s' % op_dir)
61
+ else:
62
+ print('output folder already exist, program exited!')
63
+ exit()
64
+ os.system('mkdir %s' % op_dir)
65
+
66
+ if (chain_1 is not None) and (chain_2 is not None) and (chain_dir is None):
67
+ print('Compare two chains')
68
+ compare2chains(chain_1, chain_2, burn_in, sample_interval, with_bpcomp, with_tracecomp, op_dir, cmd_txt)
69
+
70
+ elif (chain_1 is None) and (chain_2 is None) and (chain_dir is not None):
71
+ print('Compare multiple chains')
72
+ print('Function to be added!')
73
+ print('Program exited!')
74
+
75
+ else:
76
+ print('Please compare either two chains (specified by -c1 and -c2) or multiple chains provided within -cdir')
77
+ print('Program exited!')
78
+ exit()
79
+
80
+
81
+ if __name__ == '__main__':
82
+
83
+ AssessPB_parser = argparse.ArgumentParser()
84
+ AssessPB_parser.add_argument('-c1', required=False, default=None, help='chain 1')
85
+ AssessPB_parser.add_argument('-c2', required=False, default=None, help='chain 2')
86
+ AssessPB_parser.add_argument('-cdir', required=False, default=None, help='chain folder')
87
+ AssessPB_parser.add_argument('-bi', required=False, default=1000, help='burn-in, default: 1000')
88
+ AssessPB_parser.add_argument('-si', required=False, default=10, help='sample interval, default: 10')
89
+ AssessPB_parser.add_argument('-o', required=True, default=None, help='output directory')
90
+ AssessPB_parser.add_argument('-f', required=False, action="store_true", help='force overwrite')
91
+ args = vars(AssessPB_parser.parse_args())
92
+ AssessPB(args)
@@ -1,8 +1,11 @@
1
+ 1.35.0
2
+ - new module added: AssessPB
3
+
1
4
  1.34.8
2
5
  - fixed bugs
3
6
 
4
7
  1.34.0
5
- - new module added: pb
8
+ - new module added: PB
6
9
 
7
10
  1.33.0
8
11
  - new module added: RootTreeGTDB214 and RootTreeGTDB220
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: TreeSAK
3
- Version: 1.34.8
3
+ Version: 1.35.0
4
4
  Summary: BioSAK
5
5
  Home-page: https://github.com/songweizhi/TreeSAK
6
6
  Author: Weizhi Song
@@ -24,4 +24,4 @@ Requires-Dist: kaleido
24
24
  Requires-Dist: PyPDF3
25
25
  Requires-Dist: dendropy
26
26
 
27
- TreeSAK v1.34.8
27
+ TreeSAK v1.35.0
@@ -16,6 +16,7 @@ TreeSAK/AssessCVG.py
16
16
  TreeSAK/AssessMarker.py
17
17
  TreeSAK/AssessMarkerDeltaLL.py
18
18
  TreeSAK/AssessMarkerPA.py
19
+ TreeSAK/AssessPB.py
19
20
  TreeSAK/BMGE.jar
20
21
  TreeSAK/BMGE.py
21
22
  TreeSAK/CompareMCMC.py
@@ -55,6 +55,7 @@ def print_main_help():
55
55
 
56
56
  Tree-related
57
57
  PB -> Infer tree with PhyloBayes-MPI
58
+ AssessPB -> Compare PhyloBayes chains
58
59
  MarkerSeq2Tree -> Marker sequence to tree
59
60
  MarkerRef2Tree -> Marker (reference sequence) to Tree
60
61
  GTDB_tree -> get GTDB tree
@@ -692,6 +693,19 @@ if __name__ == '__main__':
692
693
  args = vars(parser.parse_args())
693
694
  PB.PB(args)
694
695
 
696
+ elif sys.argv[1] in ['AssessPB', 'assessPB', 'assesspb']:
697
+ from TreeSAK import AssessPB
698
+ AssessPB_parser = subparsers.add_parser('AssessPB', usage=AssessPB.AssessPB_usage)
699
+ AssessPB_parser.add_argument('-c1', required=False, default=None, help='chain 1')
700
+ AssessPB_parser.add_argument('-c2', required=False, default=None, help='chain 2')
701
+ AssessPB_parser.add_argument('-cdir', required=False, default=None, help='chain folder')
702
+ AssessPB_parser.add_argument('-bi', required=False, default=1000, help='burn-in, default: 1000')
703
+ AssessPB_parser.add_argument('-si', required=False, default=10, help='sample interval, default: 10')
704
+ AssessPB_parser.add_argument('-o', required=True, default=None, help='output directory')
705
+ AssessPB_parser.add_argument('-f', required=False, action="store_true", help='force overwrite')
706
+ args = vars(parser.parse_args())
707
+ AssessPB.AssessPB(args)
708
+
695
709
  else:
696
710
  print('Unrecognized command: %s, program exited' % sys.argv[1])
697
711
  exit()
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes