Skip to content
GitLab
    • Explore Projects Groups Topics Snippets
Projects Groups Topics Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Register
  • Sign in
  • evalhyd-cpp evalhyd-cpp
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
  • Issues 3
    • Issues 3
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 1
    • Merge requests 1
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Package Registry
    • Terraform modules
  • Monitor
    • Monitor
    • Metrics
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar

En prévision de l'arrivée de la forge institutionnelle INRAE, nous vous invitons à créer vos nouveaux projets sur la forge MIA.

  • HYCAR-HydroHYCAR-Hydro
  • evalhydevalhyd
  • evalhyd-cppevalhyd-cpp
  • Merge requests
  • !6
An error occurred while fetching the assigned milestone of the selected merge_request.

release v0.1.1

  • Review changes

  • Download
  • Patches
  • Plain diff
Merged Thibault Hallouin requested to merge dev into main 1 year ago
  • Overview 0
  • Commits 9
  • Pipelines 4
  • Changes 2

fixes #6 (closed)

Viewing commit 805e4a6a
Prev Next
Show latest version
2 files
+ 14
− 3

    Preferences

    File browser
    Compare changes
  • 805e4a6a
    Thibault Hallouin
    fix bug in bootstrap sampling when period starts on Jan 1st · 805e4a6a
    Thibault Hallouin authored 1 year ago
    resolves #8
include/evalhyd/detail/uncertainty.hpp
+ 11
− 2
  • View file @ 805e4a6a

  • Edit in single-file editor

  • Open in Web IDE


@@ -76,7 +76,16 @@ namespace evalhyd
@@ -76,7 +76,16 @@ namespace evalhyd
int start_yr = v_tm.front().tm_year + 1900;
int start_yr = v_tm.front().tm_year + 1900;
int end_yr = v_tm.back().tm_year + 1900;
int end_yr = v_tm.back().tm_year + 1900;
// assume start of year block as start of time series
// deal with special case with a start on 1st of January
 
// (note: use string rather than *tm_yday* member of time_point
 
// because *tm_yday* is not set when using `std::get_time`)
 
if (datetimes[0].substr(5, 5) == "01-01")
 
{
 
// add one year to make sure last year is included in loop
 
end_yr += 1;
 
}
 
 
// take start of year block as start of time series
std::tm start_hy = v_tm.front();
std::tm start_hy = v_tm.front();
xt::xtensor<int, 1> year_blocks = xt::zeros<int>({v_tm.size()});
xt::xtensor<int, 1> year_blocks = xt::zeros<int>({v_tm.size()});
@@ -100,7 +109,7 @@ namespace evalhyd
@@ -100,7 +109,7 @@ namespace evalhyd
if ((n_days != 365) && (n_days != 366))
if ((n_days != 365) && (n_days != 366))
{
{
throw std::runtime_error(
throw std::runtime_error(
"year starting in " + std::to_string(y)
"year starting in " + std::to_string(y - 400)
+ " is incomplete"
+ " is incomplete"
);
);
}
}
changelog.rst
+ 3
− 1
  • View file @ 805e4a6a

  • Edit in single-file editor

  • Open in Web IDE


@@ -9,7 +9,7 @@ Yet to be versioned and released. Only available from *dev* branch until then.
@@ -9,7 +9,7 @@ Yet to be versioned and released. Only available from *dev* branch until then.
* remove `"WSS"` and `"AWI"` as probabilistic evaluation metric because of the
* remove `"WSS"` and `"AWI"` as probabilistic evaluation metric because of the
arbitrary nature of using the sample climatology as reference/benchmark
arbitrary nature of using the sample climatology as reference/benchmark
(`#7-CPP <https://gitlab.irstea.fr/HYCAR-Hydro/evalhyd/evalhyd-cpp/-/issues/7>`_)
(`CPP#7 <https://gitlab.irstea.fr/HYCAR-Hydro/evalhyd/evalhyd-cpp/-/issues/7>`_)
.. rubric:: Bug fixes
.. rubric:: Bug fixes
@@ -21,6 +21,8 @@ Yet to be versioned and released. Only available from *dev* branch until then.
@@ -21,6 +21,8 @@ Yet to be versioned and released. Only available from *dev* branch until then.
to the presence of square brackets in the regular expressions that do not seem
to the presence of square brackets in the regular expressions that do not seem
supported
supported
(`R#6 <https://gitlab.irstea.fr/HYCAR-Hydro/evalhyd/evalhyd-r/-/issues/6>`_)
(`R#6 <https://gitlab.irstea.fr/HYCAR-Hydro/evalhyd/evalhyd-r/-/issues/6>`_)
 
* fix bug when using calendar year as block for the bootstrapping functionality
 
(`CPP#8 <https://gitlab.irstea.fr/HYCAR-Hydro/evalhyd/evalhyd-cpp/-/issues/8>`_)
v0.1.0
v0.1.0
------
------
0 Assignees
None
Assign to
0 Reviewers
None
Request review from
Labels
0
None
0
None
    Assign labels
  • Manage project labels

Milestone
No milestone
None
None
Time tracking
No estimate or time spent
Lock merge request
Unlocked
0
0 Participants
Reference:
Source branch: dev

Menu

Explore Projects Groups Topics Snippets