max/ourMELONS
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions
604 commits 2 branches 0 tags 1.2 MiB
Commit graph

604 commits

This branch
This branch
All branches
Author SHA1 Message Date
Waldir Leoncio
6aecf38231 Fixed indMix() and subfunctions (#24) 2024-07-02 16:31:17 +02:00
Waldir Leoncio
e4af251307 Fixed tests (#24) 2024-07-02 11:23:22 +02:00
Waldir Leoncio
00ecfa4fd8 Increment version number to 0.0.0.9027 2024-06-26 14:29:25 +02:00
Waldir Leoncio
320bb28a7a Fixed docs 2024-06-26 14:27:02 +02:00
Waldir Leoncio
e615bb8b50 Increment version number to 0.0.0.9026 2024-04-11 09:47:49 +02:00
Waldir Leoncio
2a815f15cd Added (commented) test for BAPS data (#24) 2024-04-11 09:47:30 +02:00
Waldir Leoncio
99f28ba215 Renamed global environment, fixed assignments (#24) 2024-04-11 09:47:29 +02:00
Waldir Leoncio
ec959fcfb2 Fixes to laskeMuutokset() (#24) 2024-04-10 16:07:00 +02:00
Waldir Leoncio
d1e567c326 Syntax fix to indMix() (#24) 2024-04-10 16:07:00 +02:00
Waldir Leoncio
55a36e81ae Retranslated computeDiffInCounts() (#24) 2024-04-10 16:07:00 +02:00
Waldir Leoncio
c3b8da0012 Changed default npops to 3 (#24) 2024-04-10 16:06:59 +02:00
Waldir Leoncio
58a5e5a2fd laskeMuutokset() reads npop from parent functions (#24) 2024-04-10 16:06:58 +02:00
Waldir Leoncio
5deadcf3ee Using a dedicated environment for globals (#24) 
Based on suggestion from <https://stackoverflow.com/a/12605694/1169233>.
 2024-04-10 16:06:58 +02:00
Waldir Leoncio
55d302ab67 Retranslated computePopulationLogml() (#24) 2024-04-10 16:06:58 +02:00
Waldir Leoncio
98b5e7a154 Added/renamed BAPS example data (#24) 2024-04-10 16:06:56 +02:00
Waldir Leoncio
9b8da3ab4d Merge branch 'baps-format' into develop 
* baps-format:
  Increment version number to 0.0.0.9025
  Skips `greedyMix()` example until #24 is fixed
  Updated documentation (#24)
  Fails for FAST input to `greedyMix()` (#24)
  Fixed calculation og `ninds` (#24)
  Bugfixes to `indMix()` and subfunctions (#24)
  Improved handling of BAPS format (#24)
  Fixed calculation of `ninds` `ekat` (#24)
  Added processing of BAPS format
 2024-04-08 13:35:51 +02:00
Waldir Leoncio
6d875dfd8d Increment version number to 0.0.0.9025 2024-04-08 13:34:21 +02:00
Waldir Leoncio
f5c09094b0 Skips greedyMix() example until #24 is fixed 2024-04-08 13:34:14 +02:00
Waldir Leoncio
f676042a17 Updated documentation (#24) 2024-04-08 13:29:03 +02:00
Waldir Leoncio
6209bb33fa Fails for FAST input to greedyMix() (#24) 
This is a desirable feature, but was not implemented in the original BAPS, so better leave it out until the original planned features is working.
 2024-04-08 13:14:54 +02:00
Waldir Leoncio
6c3e2aff04 Fixed calculation og ninds (#24) 2024-04-08 10:11:25 +02:00
Waldir Leoncio
5c35b9ad1e Bugfixes to indMix() and subfunctions (#24) 2024-03-25 16:10:44 +01:00
Waldir Leoncio
26ab0107a8 Improved handling of BAPS format (#24) 2024-03-25 16:10:43 +01:00
Waldir Leoncio
f361975254 Fixed calculation of ninds ekat (#24) 2024-03-25 16:10:43 +01:00
Waldir Leoncio
530442487f Added processing of BAPS format 
To be eventually dropped, but useful for comparing output with MATLAB code.
 2024-03-25 16:10:41 +01:00
Waldir Leoncio
d2ec5894b3 Removed MATLAB files 
Those are now present on https://github.com/ocbe-uio/rBAPS/ and may be reconnected to this repository as a submodule
 2024-01-19 09:49:10 +01:00
Waldir Leoncio
0f3c5708d6 Merge compress-writeMixtureInfo-output into develop 
* compress-writeMixtureInfo-output:
  Updated docs
  Improved output of writeMixtureInfo()
  Auto-recognizing format of greedyMix() data
  Fixed output of greedyMix()
 2023-09-14 12:55:51 +02:00
Waldir Leoncio
9ed39d403b Updated docs 2023-09-14 12:53:34 +02:00
Waldir Leoncio
273edafd30 Improved output of writeMixtureInfo() 
Also, incremented version number to 0.0.0.9024
 2023-09-14 12:52:30 +02:00
Waldir Leoncio
63af25a63d Auto-recognizing format of greedyMix() data 
Works as long as there's only one period in the file path
 2023-09-14 11:11:37 +02:00
Waldir Leoncio
a73752364b Fixed output of greedyMix() 2023-09-14 11:02:06 +02:00
Waldir Leoncio
bde3be6344 Merge branch 'silence-writeMixtureInfo' into develop 
* silence-writeMixtureInfo:
  Added verbose argument to writeMixtureInfo()
  Increment version number to 0.0.0.9023
 2023-09-11 14:07:04 +02:00
Waldir Leoncio
ceaf7eca4b Added verbose argument to writeMixtureInfo() 2023-09-11 14:06:45 +02:00
Waldir Leoncio
fa2381411f Increment version number to 0.0.0.9023 2023-09-11 13:54:52 +02:00
Waldir Leoncio
e3f14ee97d Fixed object name in test 2023-09-11 13:53:42 +02:00
Waldir Leoncio
59fbb0a167 Merge branch 'issue-25' into develop 
* issue-25: (38 commits)
  Adjusted unit tests for #25
  Fixed sink() usage
  Fixed docs
  Exporting importFile()
  Improved handling of supported formats for greedyMix() (#25)
  Fixed basic parsing of FASTA files (#25)
  Increment version number to 0.0.0.9022
  Fixed syntax (#25)
  Improved printing (#25)
  Partial reversion of b034158 (#25)
  Fixed to indMix (#25)
  Incorporated handleData() on greedyMix() (#25)
  Improved handleData() to handle FASTA (#25)
  Added numeric output option to load_fasta() (#25)
  Fixed test text (#25)
  Added missing documentation for arguments (#25)
  Syntax fix (#25)
  Delayed resolution of FIXMEs (#25)
  Workaround for usage of MATLAB any() (#25)
  Fixed argument passing (#25)
  ...
 2023-09-11 13:15:55 +02:00
Waldir Leoncio
ce954bf801 Adjusted unit tests for #25 2023-09-11 13:14:23 +02:00
Waldir Leoncio
2b756576ac Fixed sink() usage 2023-09-11 13:14:08 +02:00
Waldir Leoncio
70ec460106 Fixed docs 2023-09-11 13:13:55 +02:00
Waldir Leoncio
882fcd4112 Exporting importFile() 2023-09-11 12:51:41 +02:00
Waldir Leoncio
3e4044bcec Improved handling of supported formats for greedyMix() (#25) 2023-09-11 12:49:21 +02:00
Waldir Leoncio
76828387a3 Fixed basic parsing of FASTA files (#25) 2023-09-11 12:15:30 +02:00
Waldir Leoncio
a88f31b3a5 Increment version number to 0.0.0.9022 2023-08-11 16:27:23 +02:00
Waldir Leoncio
cfb71bfd6d Fixed syntax (#25) 2023-08-11 16:23:02 +02:00
Waldir Leoncio
44e418f838 Improved printing (#25) 2023-08-11 16:22:45 +02:00
Waldir Leoncio
177685b6a2 Partial reversion of b034158 (#25) 
It should be OK for Z to be NULL. This currently triggers an issue on initialCounts(), which should be fixed
 2023-08-11 16:22:29 +02:00
Waldir Leoncio
372891fbe1 Fixed to indMix (#25) 2023-08-11 14:31:08 +02:00
Waldir Leoncio
3537f18d2c Incorporated handleData() on greedyMix() (#25) 2023-08-11 11:18:03 +02:00
Waldir Leoncio
f47e13d3a9 Improved handleData() to handle FASTA (#25) 2023-08-11 11:13:24 +02:00
Waldir Leoncio
95d9d658cb Added numeric output option to load_fasta() (#25) 2023-08-11 11:01:20 +02:00