Skip to content
Snippets Groups Projects

Add an option to the epc function to also get the thresholds which were used during calculation

Merged Add an option to the epc function to also get the thresholds which were used during calculation
epc_with_thresholds into master
3 unresolved threads
Merged Amir MOHAMMADI requested to merge epc_with_thresholds into master
3 unresolved threads

These thresholds are needed in epsc calculations.

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Amir MOHAMMADI
  • Amir MOHAMMADI marked as a Work In Progress

    marked as a Work In Progress

  • Amir MOHAMMADI added 8 commits

    added 8 commits

    • 3ffa34d6...142014da - 7 commits from branch master
    • c5c4017f - Add an option to the epc function to also get the thresholds which were used during calculation

    Compare with previous version

  • Amir MOHAMMADI resolved all discussions

    resolved all discussions

  • Amir MOHAMMADI unmarked as a Work In Progress

    unmarked as a Work In Progress

  • Amir MOHAMMADI assigned to @andre.anjos

    assigned to @andre.anjos

  • Amir MOHAMMADI
    Amir MOHAMMADI @amohammadi ·
    Author Owner

    ping @andre.anjos

  • André Anjos
    André Anjos @aanjos ·
    Owner

    Instead of isSorted, please keep the existing syntax and use is_sorted.

  • André Anjos
    André Anjos @aanjos started a thread on an old version of the diff
    • bob/measure/cpp/error.cpp
    514 514 (const blitz::Array<double,1>& dev_negatives,
    515 515 const blitz::Array<double,1>& dev_positives,
    516 516 const blitz::Array<double,1>& test_negatives,
    517 const blitz::Array<double,1>& test_positives, size_t points, bool isSorted) {
    517 const blitz::Array<double,1>& test_positives, size_t points, bool isSorted,
  • André Anjos
    André Anjos @aanjos started a thread on an old version of the diff
    • bob/measure/cpp/error.h
    387 389 const blitz::Array<double,1>& test_negatives,
    388 390 const blitz::Array<double,1>& test_positives,
    389 391 size_t points,
    390 bool isSorted = false);
    392 bool isSorted = false,
  • André Anjos
    André Anjos @aanjos started a thread on an old version of the diff
    • bob/measure/test_error.py
    241 241 # save('nonsep-epc.hdf5', xy)
    242 242 xyref = bob.io.base.load(F('nonsep-epc.hdf5'))
    243 243 assert numpy.allclose(xy, xyref, atol=1e-15)
    244 xy = epc(dev_negatives, dev_positives,
    245 test_negatives, test_positives, 100, False, True)
    246 assert numpy.allclose(xy[:2], xyref, atol=1e-15)
  • Amir MOHAMMADI
    Amir MOHAMMADI @amohammadi ·
    Author Owner

    wouldn't renaming isSorted break the API?

  • André Anjos
    André Anjos @aanjos ·
    Owner

    No, in C++, this is not the case.

  • Amir MOHAMMADI added 3 commits

    added 3 commits

    Compare with previous version

  • Amir MOHAMMADI
    Amir MOHAMMADI @amohammadi ·
    Author Owner

    @andre.anjos I did a lint too. If that's not ok I can revert it.

  • André Anjos
    André Anjos @aanjos ·
    Owner

    Please - let's not merge all at once. It is confusing for me reviewing it.

  • André Anjos merged

    merged

  • André Anjos mentioned in commit c36b74f2

    mentioned in commit c36b74f2

    • Please register or sign in to reply