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

Ant1717 from master #265

Open
wants to merge 29 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
2c6721d
Old branch ant1717 from new master to avoid a lot of conflicts
Sep 19, 2024
8a1a494
Merge branch 'master' of https://github.com/rte-antares-rpackage/anta…
Sep 19, 2024
489136c
Remove cols_to_keep cause endpoint does not send the index anymore an…
Sep 24, 2024
a197ebc
Synchronize .api_get_aggregate_links() with .api_get_aggregate_areas()
Sep 24, 2024
ad50937
Make arguments mcYears, select, areas or links empty if all values ar…
Sep 24, 2024
30f0a77
select and mcYears empty if no intersection between the two sets
Sep 25, 2024
6445e51
Merge branch 'master' of https://github.com/rte-antares-rpackage/anta…
Oct 15, 2024
4962d8d
Include mc-all query with argument synthesis
Oct 15, 2024
8e9d85c
Use synthesis variable to add attribute to the data.table
Oct 16, 2024
41d956d
if synthesis is TRUE, mcYears value is useless
Oct 16, 2024
73de7d6
Merge branch 'master' of https://github.com/rte-antares-rpackage/anta…
Oct 16, 2024
c29464d
remove readAntaresAPI()
Nov 5, 2024
e173958
Include endpoint mc-ind in .importOutputForLinks()
Nov 5, 2024
e432375
Include mc-ind endpoint in .importOutputForAreas(), .importOutputForR…
Nov 5, 2024
6bae80a
Format result for api endpoint return to match the .importOutput one
Nov 9, 2024
785f01a
Split .importOutputForClusters() mustrun vs no mustrun and make the r…
Nov 9, 2024
c478500
Treat NULL areas
Nov 9, 2024
f7c6333
Return NULl if synthesis is TRUE and integrate links part
Nov 12, 2024
8378b64
Call endpoint if API for links
Nov 12, 2024
8318486
Split .importOutputForClusters modulation vs no modulation, lowerize …
Nov 12, 2024
09d9e33
columns to convert to factor are the same to convert to lower case
Nov 12, 2024
8f50418
Add comment
Nov 13, 2024
269d511
tolower then factor, order is important to prevent char conversion
Nov 13, 2024
379b196
Add control on clustersRes before setting areas to "all"
Nov 13, 2024
74e2311
REemove additional attributes to match the legacy ones
Nov 14, 2024
0067641
Remove additional attributes in link part to match the legacy ones
Nov 14, 2024
56e4e6f
Merge branch 'master' of https://github.com/rte-antares-rpackage/anta…
Nov 20, 2024
9924127
Merge branch 'master' of https://github.com/rte-antares-rpackage/anta…
Dec 12, 2024
01a17f5
Endpoint does not send time column anymore
Dec 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add control on clustersRes before setting areas to "all"
kemihak committed Nov 13, 2024
commit 379b1960f1598d8a699b7d4ffbbd94ff135b309b
2 changes: 1 addition & 1 deletion R/readAntares.R
Original file line number Diff line number Diff line change
@@ -911,7 +911,7 @@ readAntaresAreas <- function(areas, links = TRUE, clusters = TRUE, clustersRes =
if ("mcYears" %in% unlist(select) & is.null(mcYears)) mcYears <- "all"

# If all arguments are NULL, import all areas
if (is.null(areas) & is.null(links) & is.null(clusters) & is.null(districts) & is.null(clustersST)) {
if (is.null(areas) & is.null(links) & is.null(clusters) & is.null(districts) & is.null(clustersRes) & is.null(clustersST)) {
areas <- "all"
}