Skip to content

Commit 072d3af

Browse files
committed
Clean-up
- removed Théo as maintainer in README.md - improved structure in CONTRIBUTING.md - deleted deprecated lines in Landscape.cpp
1 parent 4c7364f commit 072d3af

3 files changed

Lines changed: 4 additions & 12 deletions

File tree

CONTRIBUTING.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ All three share the same source code for the core simulation (i.e., the actual m
2626
#### Maintainers
2727

2828
- [@JetteReeg](https://github.com/JetteReeg): RScore repo and lead in R package
29-
- [@TheoPannetier](https://github.com/TheoPannetier): RScore repo and lead in batch mode
29+
3030

3131
Maintainers are responsible for coordinating development efforts and ensuring that RangeShifter keeps building continuously.
3232

@@ -84,5 +84,3 @@ Please get in touch with the RangeShifter development team (rangeshiftr@uni-pots
8484
Alternatively, proceed as with the bug fix above: create your own branch or fork _from `develop`_ and work from there, and submit a pull request when your new features are ready to join the core code.
8585
We recommend that you update your branch regularly to new changes on `develop` (using `git merge develop`) to reduce the risk of merge conflicts or your version getting out-of-touch in the late stages of development.
8686
We also recommend that you work in small commits, as this makes the code easier to debug, and makes it easier for maintainers to understand your contributions when reviewing a pull request.
87-
88-
*Do we welcome independent contributions?

Landscape.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -171,15 +171,7 @@ int InitDist::readDistribution(string distfile) {
171171
#endif
172172

173173
// open distribution file
174-
// #if RS_RCPP
175-
// dfile.open(distfile, std::ios::binary);
176-
// if (spdistraster.utf) {
177-
// // apply BOM-sensitive UTF-16 facet
178-
// dfile.imbue(std::locale(dfile.getloc(), new std::codecvt_utf16<wchar_t, 0x10ffff, std::consume_header>));
179-
// }
180-
// #else
181174
dfile.open(distfile.c_str());
182-
// #endif
183175
if (!dfile.is_open()) return 21;
184176

185177
// read landscape data from header records of distribution file

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ git subtree pull --prefix RangeShiftR/src/RScore RScore main
6161
If conflicts occur, the RScore repository should be treated as the source of truth:
6262

6363
```
64-
git checkout --theirs <path_to_RScore_subfolder> git add <path_to_RScore_subfolder> git commit
64+
git checkout --theirs <path_to_RScore_subfolder>
65+
git add <path_to_RScore_subfolder>
66+
git commit
6567
```
6668

6769
### Pushing new changes to RScore

0 commit comments

Comments
 (0)