[Getfem-commits] r5411 - in /trunk/getfem/src: getfem/getfem_models.h getfem_models.cc

[andriy . andreykiv]

Author: andrico
Date: Wed Oct 12 15:06:53 2016
New Revision: 5411

URL: http://svn.gna.org/viewcvs/getfem?rev=5411&view=rev
Log:
"Version1_" -> "Old_"

Modified:
    trunk/getfem/src/getfem/getfem_models.h
    trunk/getfem/src/getfem_models.cc

Modified: trunk/getfem/src/getfem/getfem_models.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/getfem_models.h?rev=5411&r1=5410&r2=5411&view=diff
==============================================================================
--- trunk/getfem/src/getfem/getfem_models.h     (original)
+++ trunk/getfem/src/getfem/getfem_models.h     Wed Oct 12 15:06:53 2016
@@ -129,7 +129,7 @@
     if (!(v.compare(0, 3, "Dot")) && (v[3] == '_' || v[4] == '_')) {
       v = v.substr((v[3] == '_') ? 4 : 5);
     }
-    if (!(v.compare(0, 9, "Version1_"))) v = v.substr(9);
+    if (!(v.compare(0, 9, "Old_"))) v = v.substr(9);
     return v;
   }
 
@@ -560,7 +560,7 @@
 
     /** Says if a name corresponds to a declared variable.  */
     bool variable_exists(const std::string &name) const {
-      if (!(name.compare(0, 9, "Version1_")))
+      if (!(name.compare(0, 9, "Old_")))
        return variables.count(name.substr(9)) > 0;
       else
        return variables.count(name) > 0;

Modified: trunk/getfem/src/getfem_models.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_models.cc?rev=5411&r1=5410&r2=5411&view=diff
==============================================================================
--- trunk/getfem/src/getfem_models.cc   (original)
+++ trunk/getfem/src/getfem_models.cc   Wed Oct 12 15:06:53 2016
@@ -244,7 +244,7 @@
   }
 
   bool model::is_disabled_variable(const std::string &name) const {
-    if (!(name.compare(0, 9, "Version1_"))) return false;
+    if (!(name.compare(0, 9, "Old_"))) return false;
     VAR_SET::const_iterator it = find_variable(name);
     if (!(it->second.is_variable)) return false;
     if (it->second.is_affine_dependent)
@@ -253,7 +253,7 @@
   }
 
   bool model::is_data(const std::string &name) const {
-    if (!(name.compare(0, 9, "Version1_"))) return true;
+    if (!(name.compare(0, 9, "Old_"))) return true;
     VAR_SET::const_iterator it = find_variable(name);
     if (it->second.is_affine_dependent)
       it = variables.find(it->second.org_name);
@@ -261,13 +261,13 @@
   }
 
   bool model::is_true_data(const std::string &name) const {
-    if (!(name.compare(0, 9, "Version1_"))) return true;
+    if (!(name.compare(0, 9, "Old_"))) return true;
     VAR_SET::const_iterator it = find_variable(name);
     return (!(it->second.is_variable));
   }
 
   bool model::is_affine_dependent_variable(const std::string &name) const {
-    if (!(name.compare(0, 9, "Version1_"))) return false;
+    if (!(name.compare(0, 9, "Old_"))) return false;
     VAR_SET::const_iterator it = find_variable(name);
     return (it->second.is_affine_dependent);
   }
@@ -297,7 +297,7 @@
 
   bool model::is_im_data(const std::string &name) const {
     VAR_SET::const_iterator it;
-    if (!(name.compare(0, 9, "Version1_")))
+    if (!(name.compare(0, 9, "Old_")))
       it = find_variable(name.substr(9));
     else
       it = find_variable(name);
@@ -307,7 +307,7 @@
   const im_data *
   model::pim_data_of_variable(const std::string &name) const {
     VAR_SET::const_iterator it;
-    if (!(name.compare(0, 9, "Version1_")))
+    if (!(name.compare(0, 9, "Old_")))
       it = find_variable(name.substr(9));
     else
       it = find_variable(name);
@@ -3021,7 +3021,7 @@
     GMM_ASSERT1(!complex_version, "This model is a complex one");
     context_check();
     VAR_SET::iterator it;
-    if (!(name.compare(0, 9, "Version1_"))) {
+    if (!(name.compare(0, 9, "Old_"))) {
       it = variables.find(name.substr(9)); niter = 1;
     } else {
       it = variables.find(name);
@@ -3045,7 +3045,7 @@
     GMM_ASSERT1(complex_version, "This model is a real one");
     context_check();
     VAR_SET::iterator it;
-    if (!(name.compare(0, 9, "Version1_"))) {
+    if (!(name.compare(0, 9, "Old_"))) {
       it = variables.find(name.substr(9)); niter = 1;
     } else {
       it = variables.find(name);
@@ -3069,7 +3069,7 @@
     GMM_ASSERT1(!complex_version, "This model is a complex one");
     context_check();
     VAR_SET::iterator it;
-    if (!(name.compare(0, 9, "Version1_"))) {
+    if (!(name.compare(0, 9, "Old_"))) {
       it = variables.find(name.substr(9)); niter = 1;
     } else {
       it = variables.find(name);
@@ -3094,7 +3094,7 @@
     GMM_ASSERT1(complex_version, "This model is a real one");
     context_check();
     VAR_SET::iterator it;
-    if (!(name.compare(0, 9, "Version1_"))) {
+    if (!(name.compare(0, 9, "Old_"))) {
       it = variables.find(name.substr(9)); niter = 1;
     } else {
       it = variables.find(name);