feat: time to update running image to ubt-22.04 and ubt-24.04

and update compiler to gcc11

Signed-off-by: Certseeds <[email protected]>

.github/workflows/daily.yml

@@ -14,10 +14,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ ubuntu-20.04, ubuntu-22.04 ]
+        os: [ ubuntu-22.04, ubuntu-24.04 ]
     env:
-      CC:   gcc-10
-      CXX:  g++-10
+      CC:   gcc-12
+      CXX:  g++-12
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
 

.github/workflows/pull_request.yml

@@ -15,10 +15,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ ubuntu-20.04, ubuntu-22.04 ]
+        os: [ ubuntu-22.04, ubuntu-24.04 ]
     env:
-      CC:   gcc-10
-      CXX:  g++-10
+      CC:   gcc-12
+      CXX:  g++-12
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
 
@@ -105,7 +105,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ ubuntu-20.04, ubuntu-22.04 ]
+        os: [ ubuntu-22.04, ubuntu-24.04 ]
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:

.github/workflows/release.yml

@@ -16,10 +16,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ ubuntu-20.04, ubuntu-22.04 ]
+        os: [ ubuntu-22.04, ubuntu-24.04 ]
     env:
-      CC:   gcc-10
-      CXX:  g++-10
+      CC:   gcc-12
+      CXX:  g++-12
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
 

.github/workflows/rust_build.yml

@@ -20,7 +20,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ windows-latest,ubuntu-20.04, ubuntu-22.04 ]
+        os: [ windows-latest,ubuntu-22.04, ubuntu-24.04 ]
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
 

.github/workflows/test.yml

@@ -9,7 +9,7 @@ jobs:
   test:
     name: test dev
     # The type of runner that the job will run on
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:

algorithm/matrix/matrix.hpp

@@ -486,46 +486,33 @@ struct number : public Expression<number<T>> {
 
     // work function, computing this expression at position i, import for lazy computing
 
-    T value(size_t i, size_t j) const { return this->num; }
+    T value(size_t i, size_t j) const { return this->num;}
+
     //before invoke, invoke the ~number
     // 感觉是优化错误
 
     size_t rows() const { return 0x3f3f3f3f; }
 
     size_t cols() const { return 0x3f3f3f3f; }
-
 };
 
+template<opencv_type T>
+static number<T> make_number(T t){
+    return number<T>(t);
+}
+
 template<typename T1, typename T2>
 inline EXPRESSION::BinaryOp<Add, T1, T2>
 operator+(const Expression<T1> &lhs, const Expression<T2> &rhs) {
     return expToBinaryOp<Add>(lhs, rhs);
 }
 
-template<typename T1, opencv_type T2>
-inline EXPRESSION::BinaryOp<Add, T1, number<T2>>
-operator+(const Expression<T1> &lhs, const T2 &rhs) {
-    return expToBinaryOp<Add>(lhs, number<T2>(rhs));
-}
-
-template<typename T1, opencv_type T2>
-inline EXPRESSION::BinaryOp<Add, number<T1>, T2>
-operator+(const T1 &lhs, const Expression<T2> &rhs) {
-    return expToBinaryOp<Add>(rhs, lhs);
-}
-
 /**
  * matrix + matrix, must equal.
  *  * input mat1,mat2 and will_return's type is same.
  * */
 
 
-template<opencv_type T1, typename T2>
-inline EXPRESSION::BinaryOp<Add, number<T1>, T2>
-operator-(const T1 &lhs, const Expression<T2> &rhs) {
-    return expToBinaryOp<Add>(number<T2>(lhs * -1), rhs);
-}
-
 /**
  * matrix - matrix, must equal.
  * input mat1,mat2 and will_return's type is same.
@@ -536,12 +523,6 @@ operator-(const Expression<T1> &lhs, const Expression<T2> &rhs) {
     return expToBinaryOp<Minus>(lhs, rhs);
 }
 
-template<typename T1, opencv_type T2>
-inline EXPRESSION::BinaryOp<Minus, T1, number<T2>>
-operator-(const Expression<T1> &lhs, const T2 &rhs) {
-    return expToBinaryOp<Minus>(lhs, number<T2>(rhs));
-}
-
 
 /**
  * matrix * number, need T1 can * T2

algorithm/matrix/matrix_test.cpp

@@ -379,8 +379,8 @@ TEST_CASE("operator plus", "[test_3]") {
     m25 = m2 + m5;
     Matrix<int32_t> m36{m3 + m6};
     Matrix<int32_t> temp = m1 + m4 + m7;
-    Matrix<int32_t> temp2 = m1 + m4 + m7 + 2;
-    Matrix<int32_t> temp4 = m1 + m4 + 2 + m7;
+    Matrix<int32_t> temp2 = m1 + m4 + m7 + make_number(2);
+    Matrix<int32_t> temp4 = m1 + m4 + make_number(2) + m7;
     CHECK(Matrix<int32_t>::inside_equal(m1 + m4, m7));
     CHECK(Matrix<int32_t>::inside_equal(m14, m7));
     CHECK(Matrix<int32_t>::inside_equal(m2 + m5, m8));