Skip to content

Commit

Permalink
apply code-format changes
Browse files Browse the repository at this point in the history
  • Loading branch information
nihui authored and github-actions[bot] committed Feb 21, 2025
1 parent b79edee commit cbe26bd
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 17 deletions.
41 changes: 25 additions & 16 deletions src/expression.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,20 +63,20 @@ int count_expression_blobs(const std::string& expr)

std::vector<int> eval_list_expression(const std::string& expr, const std::vector<Mat>& blobs)
{
// /(0w,2),*(0h,2),0c
// /(0w,2),*(0h,2),0c

// split by , ( )
//
// /
// 0w
// 2
// -------------------
// *
// 0h
// 2
// -------------------
// 0c
// -------------------
// split by , ( )
//
// /
// 0w
// 2
// -------------------
// *
// 0h
// 2
// -------------------
// 0c
// -------------------

// split by , ( )

Expand Down Expand Up @@ -124,9 +124,18 @@ std::vector<int> eval_list_expression(const std::string& expr, const std::vector
float f;
};

typed_value() : type(0), i(0) {}
typed_value(int _i) : type(0), i(_i) {}
typed_value(float _f) : type(1), f(_f) {}
typed_value()
: type(0), i(0)
{
}
typed_value(int _i)
: type(0), i(_i)
{
}
typed_value(float _f)
: type(1), f(_f)
{
}

int to_int()
{
Expand Down
1 change: 0 additions & 1 deletion tests/test_paramdict.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,6 @@ static int test_paramdict_6()

int main()
{

std::vector<ncnn::Mat> blobs(2);
blobs[0].w = 100;
blobs[0].h = 200;
Expand Down

0 comments on commit cbe26bd

Please sign in to comment.