[Getfem-commits] r4963 - in /trunk/getfem/src: ./ getfem/

[Yves . Renard]

Author: renard
Date: Tue Apr 21 14:11:59 2015
New Revision: 4963

URL: http://svn.gna.org/viewcvs/getfem?rev=4963&view=rev
Log:
remove bgeot_vector.h

Removed:
    trunk/getfem/src/getfem/bgeot_vector.h
Modified:
    trunk/getfem/src/Makefile.am
    trunk/getfem/src/bgeot_poly.cc
    trunk/getfem/src/getfem/bgeot_config.h
    trunk/getfem/src/getfem/bgeot_geotrans_inv.h
    trunk/getfem/src/getfem/bgeot_kdtree.h
    trunk/getfem/src/getfem/bgeot_node_tab.h
    trunk/getfem/src/getfem/bgeot_rtree.h
    trunk/getfem/src/getfem/bgeot_small_vector.h
    trunk/getfem/src/getfem/bgeot_tensor.h

Modified: trunk/getfem/src/Makefile.am
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/Makefile.am?rev=4963&r1=4962&r2=4963&view=diff
==============================================================================
--- trunk/getfem/src/Makefile.am        (original)
+++ trunk/getfem/src/Makefile.am        Tue Apr 21 14:11:59 2015
@@ -84,7 +84,6 @@
        getfem/bgeot_small_vector.h                     \
        getfem/bgeot_sparse_tensors.h                   \
        getfem/bgeot_tensor.h                           \
-       getfem/bgeot_vector.h                           \
        getfem/bgeot_comma_init.h                       \
        getfem/bgeot_ftool.h                            \
        getfem/getfem_arch_config.h                     \

Modified: trunk/getfem/src/bgeot_poly.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/bgeot_poly.cc?rev=4963&r1=4962&r2=4963&view=diff
==============================================================================
--- trunk/getfem/src/bgeot_poly.cc      (original)
+++ trunk/getfem/src/bgeot_poly.cc      Tue Apr 21 14:11:59 2015
@@ -22,7 +22,7 @@
 
 
 #include "getfem/bgeot_poly.h"
-#include "getfem/bgeot_vector.h"
+#include "getfem/bgeot_small_vector.h"
 #include "getfem/bgeot_ftool.h"
 
 namespace bgeot {

Modified: trunk/getfem/src/getfem/bgeot_config.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/bgeot_config.h?rev=4963&r1=4962&r2=4963&view=diff
==============================================================================
--- trunk/getfem/src/getfem/bgeot_config.h      (original)
+++ trunk/getfem/src/getfem/bgeot_config.h      Tue Apr 21 14:11:59 2015
@@ -106,8 +106,6 @@
 #  define LONG_SCAL(xx) long_scalar_type(#xx) /* string assignment to preserve 
the precision */
 #endif
 
-
-
   // For compatibility with Getfem 2.0
 
   using gmm::dimension_error;

Modified: trunk/getfem/src/getfem/bgeot_geotrans_inv.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/bgeot_geotrans_inv.h?rev=4963&r1=4962&r2=4963&view=diff
==============================================================================
--- trunk/getfem/src/getfem/bgeot_geotrans_inv.h        (original)
+++ trunk/getfem/src/getfem/bgeot_geotrans_inv.h        Tue Apr 21 14:11:59 2015
@@ -53,7 +53,7 @@
 #define BGEOT_GEOTRANS_INV_H__
 
 #include "bgeot_geometric_trans.h"
-#include "bgeot_vector.h"
+#include "bgeot_small_vector.h"
 #include "bgeot_kdtree.h"
 
 namespace bgeot {

Modified: trunk/getfem/src/getfem/bgeot_kdtree.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/bgeot_kdtree.h?rev=4963&r1=4962&r2=4963&view=diff
==============================================================================
--- trunk/getfem/src/getfem/bgeot_kdtree.h      (original)
+++ trunk/getfem/src/getfem/bgeot_kdtree.h      Tue Apr 21 14:11:59 2015
@@ -39,7 +39,7 @@
 
     Basically, a KD-tree is a balanced N-dimensional tree.
 */
-#include "bgeot_vector.h"
+#include "bgeot_small_vector.h"
 
 namespace bgeot {
   struct kdtree_elt_base;

Modified: trunk/getfem/src/getfem/bgeot_node_tab.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/bgeot_node_tab.h?rev=4963&r1=4962&r2=4963&view=diff
==============================================================================
--- trunk/getfem/src/getfem/bgeot_node_tab.h    (original)
+++ trunk/getfem/src/getfem/bgeot_node_tab.h    Tue Apr 21 14:11:59 2015
@@ -39,7 +39,7 @@
     that are nearer than a certain very small distance.
 
 */
-#include "bgeot_vector.h"
+#include "bgeot_small_vector.h"
 #include "dal_tree_sorted.h"
 #include "set"
 

Modified: trunk/getfem/src/getfem/bgeot_rtree.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/bgeot_rtree.h?rev=4963&r1=4962&r2=4963&view=diff
==============================================================================
--- trunk/getfem/src/getfem/bgeot_rtree.h       (original)
+++ trunk/getfem/src/getfem/bgeot_rtree.h       Tue Apr 21 14:11:59 2015
@@ -39,7 +39,7 @@
 */
 
 #include <set>
-#include "bgeot_vector.h"
+#include "bgeot_small_vector.h"
 
 namespace bgeot {
 

Modified: trunk/getfem/src/getfem/bgeot_small_vector.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/bgeot_small_vector.h?rev=4963&r1=4962&r2=4963&view=diff
==============================================================================
--- trunk/getfem/src/getfem/bgeot_small_vector.h        (original)
+++ trunk/getfem/src/getfem/bgeot_small_vector.h        Tue Apr 21 14:11:59 2015
@@ -389,6 +389,33 @@
 
   template<class T> inline small_vector<T> operator *(T x, const 
small_vector<T>& m)
   { return m*x; }
+
+
+
+  typedef std::vector<scalar_type> base_vector;
+  typedef small_vector<scalar_type> base_small_vector;
+  typedef base_small_vector base_node;
+  typedef gmm::dense_matrix<scalar_type> base_matrix;
+
+  template <class VEC_CONT>
+  void vectors_to_base_matrix(base_matrix &G, const VEC_CONT &a) {
+    size_type P = (*(a.begin())).size(), NP = a.end() - a.begin();
+    G.resize(P, NP);
+    typename VEC_CONT::const_iterator it = a.begin(), ite = a.end();
+    base_matrix::iterator itm = G.begin();
+    for (; it != ite; ++it, itm += P)
+      std::copy((*it).begin(), (*it).end(), itm);
+  }
+
+
+
 }
 
+
+namespace std {
+  inline void swap(bgeot::base_node& a, bgeot::base_node& b) { a.swap(b); }
+}
+
+#include "gmm/gmm_interface_bgeot.h"
+
 #endif

Modified: trunk/getfem/src/getfem/bgeot_tensor.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/bgeot_tensor.h?rev=4963&r1=4962&r2=4963&view=diff
==============================================================================
--- trunk/getfem/src/getfem/bgeot_tensor.h      (original)
+++ trunk/getfem/src/getfem/bgeot_tensor.h      Tue Apr 21 14:11:59 2015
@@ -37,7 +37,7 @@
 #ifndef BGEOT_TENSOR_H__
 #define BGEOT_TENSOR_H__
 
-#include "bgeot_vector.h"
+#include "bgeot_small_vector.h"
 #include "getfem/getfem_omp.h"
 
 

Removed: trunk/getfem/src/getfem/bgeot_vector.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/bgeot_vector.h?rev=4962&view=auto
==============================================================================
--- trunk/getfem/src/getfem/bgeot_vector.h      (original)
+++ trunk/getfem/src/getfem/bgeot_vector.h      (removed)
@@ -1,72 +0,0 @@
-/* -*- c++ -*- (enables emacs c++ mode) */
-/*===========================================================================
- 
- Copyright (C) 1995-2012 Yves Renard
- 
- This file is a part of GETFEM++
- 
- Getfem++  is  free software;  you  can  redistribute  it  and/or modify it
- under  the  terms  of the  GNU  Lesser General Public License as published
- by  the  Free Software Foundation;  either version 3 of the License,  or
- (at your option) any later version along with the GCC Runtime Library
- Exception either version 3.1 or (at your option) any later version.
- This program  is  distributed  in  the  hope  that it will be useful,  but
- WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- or  FITNESS  FOR  A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- License and GCC Runtime Library Exception for more details.
- You  should  have received a copy of the GNU Lesser General Public License
- along  with  this program;  if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA.
- 
- As a special exception, you  may use  this file  as it is a part of a free
- software  library  without  restriction.  Specifically,  if   other  files
- instantiate  templates  or  use macros or inline functions from this file,
- or  you compile this  file  and  link  it  with other files  to produce an
- executable, this file  does  not  by itself cause the resulting executable
- to be covered  by the GNU Lesser General Public License.  This   exception
- does not  however  invalidate  any  other  reasons why the executable file
- might be covered by the GNU Lesser General Public License.
- 
-===========================================================================*/
-
-/address@hidden bgeot_vector.h
-   @author  Yves Renard <address@hidden>
-   @date June 01, 1995.
-   @brief some (old) vector class, and some typedefs.
-
-   vsvector should be replaced by gmm calls.
-*/
-
-#ifndef BGEOT_VECTOR_H__
-#define BGEOT_VECTOR_H__
-
-#include "bgeot_config.h"
-#include "gmm/gmm_kernel.h"
-#include "bgeot_small_vector.h"
-
-namespace bgeot {
-
-  typedef std::vector<scalar_type> base_vector;
-  typedef small_vector<scalar_type> base_small_vector;
-  typedef base_small_vector base_node;
-  typedef gmm::dense_matrix<scalar_type> base_matrix;
-
-  template <class VEC_CONT>
-  void vectors_to_base_matrix(base_matrix &G, const VEC_CONT &a) {
-    size_type P = (*(a.begin())).size(), NP = a.end() - a.begin();
-    G.resize(P, NP);
-    typename VEC_CONT::const_iterator it = a.begin(), ite = a.end();
-    base_matrix::iterator itm = G.begin();
-    for (; it != ite; ++it, itm += P)
-      std::copy((*it).begin(), (*it).end(), itm);
-  }
-
-}  /* end of namespace bgeot.                                           */
-
-namespace std {
-  inline void swap(bgeot::base_node& a, bgeot::base_node& b) { a.swap(b); }
-}
-
-#include "gmm/gmm_interface_bgeot.h"
-
-#endif  /* BGEOT_VECTOR_H__ */