Repository navigation
Decrease full.lst size #2491
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
Merged
simonkrogmann
merged 1 commit into
remindmodel:develop
from
simonkrogmann:small-full-lst
Oct 8, 2026
Merged
Decrease full.lst size #2491
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,6 +5,27 @@ | |
| # | REMIND License Exception, version 1.0 (see LICENSE file). | ||
| # | Contact: [email protected] | ||
|
|
||
| library(stringr) | ||
| library(glue) | ||
|
|
||
| #' check if delimiters only occur paired in a file. No nesting allowed. | ||
| #' | ||
| #' @param file_path where to check | ||
| #' @param openDelim string of the open delimiter | ||
| #' @param closeDelim string of the closing delimiter | ||
| #' | ||
| #' @return boolean | ||
| validatePairedDelimiters <- function(file_path, openDelim = "$onDelim", closeDelim = "$offDelim") { | ||
| content <- paste(readLines(file_path, warn = FALSE), collapse = "\n") | ||
| matches <- str_extract_all(content, glue("{str_escape(openDelim)}|{str_escape(closeDelim)}"))[[1]] | ||
|
|
||
| # Build expected alternating sequence | ||
| expected <- rep_len(c(openDelim, closeDelim), length(matches)) | ||
|
|
||
| # Valid if matches alternating pattern AND count is even | ||
| return(length(matches) %% 2 == 0 && identical(matches, expected)) | ||
| } | ||
|
|
||
| prepare <- function() { | ||
|
|
||
| timePrepareStart <- Sys.time() | ||
|
|
@@ -227,6 +248,15 @@ prepare <- function() { | |
| ' are missing. Call RSE immediately') | ||
| } | ||
|
|
||
| # $offlisting appears in main.gms but the current process does not let it survive into full.gms | ||
| # therefore all cs3r/cs4r file contents are dumped directly into the full.lst | ||
| # to avoid this we add $offlisting manually at $onDelim present at each include of a cs4r/cs3r | ||
| # first do a sanity check on "$onDelim", "$offDelim" | ||
| if (!validatePairedDelimiters(dumpFilePath, "$onDelim", "$offDelim")) { | ||
| stop("We either have nested $onDelim/$offDelim blocks (unnecessarily large) or $onDelim/$offDelim are not correctly matched.") | ||
| } | ||
| lucode2::manipulateFile(dumpFilePath, list(c("$onDelim", "$offlisting\n$onDelim"), c("$offDelim", "$offDelim\n$onlisting")), fixed = TRUE) | ||
|
|
||
| file.rename(from[exist], to[exist]) | ||
|
|
||
| if ( 0 < exitcode ) { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should it be deleted everywhere where it is already used?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unfortunately $offlisting does not get passed to the full.gms at all. The creation of full.gms removes all instances of it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seems to be a side effect of dumpopt=21 here:
remind/scripts/start/prepare.R
Line 213 in aa53be6