From f5771a6a076be5f4cdc1729eab8508113696dc5f Mon Sep 17 00:00:00 2001
From: Tobias Leibner <tobias.leibner@googlemail.com>
Date: Thu, 6 Sep 2018 20:40:45 +0200
Subject: [PATCH] [common.matrix.dense] remove deep_copy
---
.gitsuper | 18 +++++++++---------
dune/xt/la/container/common/matrix/dense.hh | 12 ++----------
2 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/.gitsuper b/.gitsuper
index e457fa291..0b60b2578 100644
--- a/.gitsuper
+++ b/.gitsuper
@@ -4,23 +4,23 @@ status = 1a3bcab04b011a5d6e44f9983cae6ff89fa695e8 bin (heads/master)
20a673b9dad7e2e25bd97defa8849debb59d247c config.opts (heads/master)
8f2c5aba441417bf2c42f22272f538c68a89cc4a dune-alugrid (remotes/origin/releases/2.5)
707acf201d5a754c80f87cc4d71aa36bf29a6e3f dune-common (v2.5.1-9-g707acf20)
- +17ce566cb99f1be9bb0e9990dbf280a4375cd973 dune-gdt (heads/entropy_flux_even_newer)
+ +b970966098de3d96005a3a09cdfd3ca8c5874d26 dune-gdt (heads/entropy_flux_even_newer)
390a2c503783bbed778a8ff610f8c5ca09c238d0 dune-geometry (v2.5.1-5-g390a2c5)
d7b20bbc5f6fdcfc312beb0ea5d16d39ea26904e dune-grid (v2.5.1-2-gd7b20bbc5)
- +e9d9a3336735090648637e044e279866bbea3597 dune-grid-glue (v2.4.0-60-ge9d9a33)
+ 9e29a333e8af02382d80b95335a784d5ce1ea2c8 dune-grid-glue (v2.4.0-70-g9e29a33)
63df56a54f81eda308233a683eb329e77e69f0a9 dune-istl (v2.5.1rc1)
0d757d65e5d57134a7ecf304e35d063f4ccc7116 dune-localfunctions (v2.5.1rc1)
8a69fc68165780921bbba77da338b6932daf983c dune-pybindxi (v2.2.1-16-g8a69fc6)
741e4f8e53bdd3e1b6e19d84eb22b6e3dc48526c dune-python (remotes/origin/releases/2.5)
26cc8cb4161a3a51002ab2a81b8c81d2c951ee79 dune-testtools (remotes/origin/p/renemilk/testname_listing_hack_no-skiptest)
0a74e7dd0b2115778a5d490dab08a2ed07fcaa1e dune-uggrid (v2.5.2)
- aa99fc15ae0bc467e0f0df0e48721ab66a9bb74a dune-xt-common (heads/dailywork_tleibner)
+ +84d7fed4cae2675c20a76a0e308045d85ffcc631 dune-xt-common (heads/dailywork_tleibner)
f93419066883a68c4e0ba96acc3d451ba971876a dune-xt-data (heads/dailywork_tleibner)
83b29cbe84d0af6579d6904f59598ad3dd132996 dune-xt-functions (heads/dailywork_tleibner)
9432a18b5de2931e06bf1b4eeefa8de1d1820c0f dune-xt-grid (heads/dailywork_tleibner)
- +2c8a889092620f916cfbc7a76b812494ea40ba11 dune-xt-la (heads/dailywork-tleibner)
+ +e6131336024996c2d2ba43d1bc01b84492536a16 dune-xt-la (heads/remove_cow)
09d0378f616b94d68bcdd9fc6114813181849ec0 scripts (heads/master)
-commit = ef338bb43fc2435c08479109d90f65d46ea484e6
+commit = 2967bdedc638aa2ba19ebfcaf4dd5735758aeba0
[submodule.bin]
remote = git@github.com:dune-community/local-bin.git
@@ -45,7 +45,7 @@ commit = 707acf201d5a754c80f87cc4d71aa36bf29a6e3f
[submodule.dune-gdt]
remote = git@github.com:dune-community/dune-gdt.git
status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master)
-commit = 17ce566cb99f1be9bb0e9990dbf280a4375cd973
+commit = b970966098de3d96005a3a09cdfd3ca8c5874d26
[submodule.dune-geometry]
remote = git@github.com:dune-community/dune-geometry.git
@@ -60,7 +60,7 @@ commit = d7b20bbc5f6fdcfc312beb0ea5d16d39ea26904e
[submodule.dune-grid-glue]
remote = https://github.com/dune-mirrors/dune-grid-glue.git
status =
-commit = e9d9a3336735090648637e044e279866bbea3597
+commit = 9e29a333e8af02382d80b95335a784d5ce1ea2c8
[submodule.dune-istl]
remote = https://github.com/dune-mirrors/dune-istl.git
@@ -95,7 +95,7 @@ commit = 0a74e7dd0b2115778a5d490dab08a2ed07fcaa1e
[submodule.dune-xt-common]
remote = git@github.com:dune-community/dune-xt-common.git
status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master)
-commit = aa99fc15ae0bc467e0f0df0e48721ab66a9bb74a
+commit = 84d7fed4cae2675c20a76a0e308045d85ffcc631
[submodule.dune-xt-data]
remote = git@github.com:dune-community/dune-xt-data
@@ -115,7 +115,7 @@ commit = 9432a18b5de2931e06bf1b4eeefa8de1d1820c0f
[submodule.dune-xt-la]
remote = git@github.com:dune-community/dune-xt-la.git
status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master)
-commit = 2c8a889092620f916cfbc7a76b812494ea40ba11
+commit = e6131336024996c2d2ba43d1bc01b84492536a16
[submodule.scripts]
remote = https://github.com/wwu-numerik/scripts.git
diff --git a/dune/xt/la/container/common/matrix/dense.hh b/dune/xt/la/container/common/matrix/dense.hh
index 6d95f6e30..6977bbaad 100644
--- a/dune/xt/la/container/common/matrix/dense.hh
+++ b/dune/xt/la/container/common/matrix/dense.hh
@@ -235,9 +235,6 @@ public:
*backend_ = *other.backend_;
}
- /**
- * \note Does a deep copy.
- */
ThisType& operator=(const BackendType& other)
{
backend_ = std::make_shared<BackendType>(other);
@@ -465,11 +462,6 @@ public:
using InterfaceType::operator+=;
using InterfaceType::operator-=;
- void deep_copy(const ThisType& other)
- {
- *backend_ = *other.backend_;
- }
-
template <class OtherMatrixType>
void rightmultiply(const OtherMatrixType& other)
{
@@ -498,12 +490,12 @@ public:
ScalarType& get_entry_ref(const size_t rr, const size_t cc)
{
- return backend_.get_entry_ref(rr, cc);
+ return backend_->get_entry_ref(rr, cc);
}
const ScalarType& get_entry_ref(const size_t rr, const size_t cc) const
{
- return backend_.get_entry_ref(rr, cc);
+ return backend_->get_entry_ref(rr, cc);
}
// get pointer to begin of row (row major backend) or column (column major backend)
--
GitLab