Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/style_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Lint with clang-format
run: |
# lint files (all .cpp and .h files) inplace
find ./src/bindings/PyDP -iname *.hpp -o -iname *.cpp -iname *.h -iname *.cc | xargs clang-format -i -style='file'
find ./src/bindings/ -iname *.hpp -o -iname *.cpp -o -iname *.h -o -iname *.cc | xargs clang-format -i -style='file'
# print changes
git diff src
# already well formated if 'git diff' doesn't output
Expand Down
4 changes: 2 additions & 2 deletions src/bindings/PyDP/algorithms/bounded_functions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ class BoundedMeanDummy : public Dummy {
};

class BoundedSumDummy : public Dummy {
public:
public:
using Dummy::Dummy;
double Result(py::list l) override {
return Result_BoundedSum(obj, l);
}
};

class BoundedStandardDeviationDummy : public Dummy {
public:
public:
using Dummy::Dummy;
double Result(py::list l) override {
return Result_BoundedStandardDeviation(obj, l);
Expand Down
8 changes: 4 additions & 4 deletions src/bindings/PyDP/algorithms/rand.cpp
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
// Provides bindings for rand
#include "differential_privacy/algorithms/rand.h"
#include "../pydp_lib/casting.hpp"
#include "pybind11/pybind11.h"
#include "differential_privacy/algorithms/rand.h"

namespace py = pybind11;
namespace dp = differential_privacy;

void declareRandFunctions(py::module & m) {
m.def("UniformDouble",&dp::UniformDouble);
m.def("Geometric",&dp::Geometric);
void declareRandFunctions(py::module& m) {
m.def("UniformDouble", &dp::UniformDouble);
m.def("Geometric", &dp::Geometric);
}

void init_algorithms_rand(py::module& m) {
Expand Down
2 changes: 1 addition & 1 deletion src/bindings/PyDP/bindings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ void init_algorithms_distributions(py::module &);
void init_algorithms_order_statistics(py::module &);

// rand
void init_algorithms_rand(py::module&);
void init_algorithms_rand(py::module &);

// proto
void init_proto(py::module &);
Expand Down
36 changes: 17 additions & 19 deletions src/bindings/c/c_api.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#include "differential_privacy/algorithms/algorithm.h"

#include "differential_privacy/algorithms/bounded-mean.h"
#include "differential_privacy/algorithms/bounded-sum.h"
#include "differential_privacy/algorithms/bounded-standard-deviation.h"
#include "differential_privacy/algorithms/bounded-sum.h"

#include "absl/random/distributions.h"
#include "differential_privacy/algorithms/order-statistics.h"
Expand Down Expand Up @@ -51,24 +51,22 @@ double Result_BoundedSum(BoundedFunctionHelperObject* config, pybind11::list l)
std::unique_ptr<BoundedSum<double>> sum;
if (has_bounds) {
sum = BoundedSum<double>::Builder()
.SetEpsilon(config->epsilon)
.SetLower(config->lower)
.SetUpper(config->upper)
.Build()
.ValueOrDie();
.SetEpsilon(config->epsilon)
.SetLower(config->lower)
.SetUpper(config->upper)
.Build()
.ValueOrDie();
} else {
sum =
BoundedSum<double>::Builder()
.SetEpsilon(config->epsilon)
.Build()
.ValueOrDie();
BoundedSum<double>::Builder().SetEpsilon(config->epsilon).Build().ValueOrDie();
}
Output result = sum->Result(a.begin(), a.end()).ValueOrDie();

return GetValue<double>(result);
}

double Result_BoundedStandardDeviation(BoundedFunctionHelperObject* config, pybind11::list l) {
double Result_BoundedStandardDeviation(BoundedFunctionHelperObject* config,
pybind11::list l) {
std::vector<double> a;

for (auto i : l) {
Expand All @@ -78,16 +76,16 @@ double Result_BoundedStandardDeviation(BoundedFunctionHelperObject* config, pybi

if (has_bounds) {
standard_deviation = BoundedStandardDeviation<double>::Builder()
.SetEpsilon(config->epsilon)
.SetLower(config->lower)
.SetUpper(config->upper)
.Build()
.ValueOrDie();
.SetEpsilon(config->epsilon)
.SetLower(config->lower)
.SetUpper(config->upper)
.Build()
.ValueOrDie();
} else {
standard_deviation = BoundedStandardDeviation<double>::Builder()
.SetEpsilon(config->epsilon)
.Build()
.ValueOrDie();
.SetEpsilon(config->epsilon)
.Build()
.ValueOrDie();
}
Output result = standard_deviation->Result(a.begin(), a.end()).ValueOrDie();

Expand Down
3 changes: 2 additions & 1 deletion src/bindings/c/c_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ extern double Result_BoundedMean(BoundedFunctionHelperObject* config, pybind11::

extern double Result_BoundedSum(BoundedFunctionHelperObject* config, pybind11::list a);

extern double Result_BoundedStandardDeviation(BoundedFunctionHelperObject* config, pybind11::list a);
extern double Result_BoundedStandardDeviation(BoundedFunctionHelperObject* config,
pybind11::list a);

// Order statistics
extern int64_t Result_Max(BoundedFunctionHelperObject* config, pybind11::list a,
Expand Down