Changeset eb72ba1 in git

Timestamp:

May 5, 2011, 7:20:57 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')

Children:

61e9142166e8873869d9cf125c3809be22c5ae88

Parents:

750e704356a16e0d46bd540f5fe07a831a40cded

Message:

FIX: eliminated 'bad' variables (due to C++ standard) for the ticket #333:
e.g. kernel/f5data.h: _RuleOld, kernel/mpr_base.cc: _Qi, kernel/p_polys.cc: _(External|Shifted)?Components

From: Oleksandr Motsak <motsak@mathematik.uni-kl.de>

git-svn-id: file:///usr/local/Singular/svn/trunk@14205 2c84dea3-7e68-4137-9b89-c4e89433aadc

Files:

• Singular/Minor.cc (modified) (3 diffs)
• Singular/Minor.h (modified) (1 diff)
• Singular/janet.cc (modified) (1 diff)
• kernel/f5data.h (modified) (3 diffs)
• kernel/mpr_base.cc (modified) (2 diffs)
• kernel/p_polys.cc (modified) (3 diffs)

Singular/Minor.cc

@@ -825 +825 @@
 }
 
-int MinorValue::_RankingStrategy = -1;
+int MinorValue::g_rankingStrategy = -1;
 
 int MinorValue::getWeight () const
@@ -898 +898 @@
 void MinorValue::SetRankingStrategy (const int rankingStrategy)
 {
-  _RankingStrategy = rankingStrategy;
-  if (_RankingStrategy == 6)
+  g_rankingStrategy = rankingStrategy;
+  if (g_rankingStrategy == 6)
   {
     /* initialize the random generator with system time */
@@ -908 +908 @@
 int MinorValue::GetRankingStrategy()
 {
-  return _RankingStrategy;
+  return g_rankingStrategy;
 }
 

Singular/Minor.h

@@ -533 +533 @@
     * This member can be set using MinorValue::SetRankingStrategy (const int).
     */
-    static int _RankingStrategy;
-    
-    /**
-    * Accessor for the static private field _RankingStrategy.
+    static int g_rankingStrategy;
+    
+    /**
+    * Accessor for the static private field g_rankingStrategy.
     */
     static int GetRankingStrategy();

Singular/janet.cc

@@ -987 +987 @@
 }
 
-int ComputeBasis(jList *_T,jList *_Q)
+int ComputeBasis(jList *_lT,jList *_lQ)
 {
   int gb_l,i,ret_value=1;
 
-  T=_T; Q=_Q;
+  T=_lT; Q=_lQ;
 
 //  Debug();

kernel/f5data.h

@@ -32 +32 @@
         int     index;          //index of signature
         poly    polynomial;     //standard polynomial data
-        RuleOld*   _RuleOld;
+        RuleOld*   _ruleOld;
         bool    del;
     public:
@@ -78 +78 @@
 
 void LPolyOld::setRuleOld(RuleOld* r) {
-    _RuleOld   =   r;
+    _ruleOld   =   r;
 }
 
@@ -98 +98 @@
 
 RuleOld* LPolyOld::getRuleOld() {
-    return _RuleOld;
+    return _ruleOld;
 }
 

kernel/mpr_base.cc

@@ -284 +284 @@
    * The Alg computes conv(Qi[]+shift[]).
    */
-  pointSet * getInnerPoints( pointSet **_Qi, mprfloat _shift[] );
+  pointSet * getInnerPoints( pointSet **_q_i, mprfloat _shift[] );
 
 private:
@@ -889 +889 @@
 
 //-> mayanPyramidAlg::*
-pointSet * mayanPyramidAlg::getInnerPoints( pointSet **_Qi, mprfloat _shift[] )
+pointSet * mayanPyramidAlg::getInnerPoints( pointSet **_q_i, mprfloat _shift[] )
 {
   int i;
 
-  Qi= _Qi;
+  Qi= _q_i;
   shift= _shift;
 

kernel/p_polys.cc

@@ -28 +28 @@
  ***************************************************************/
 // this is special for the syz stuff
-static int* _Components = NULL;
-static long* _ShiftedComponents = NULL;
-static int _ExternalComponents = 0;
+static int* _components = NULL;
+static long* _componentsShifted = NULL;
+static int _componentsExternal = 0;
 
 BOOLEAN pSetm_error=0;
@@ -153 +153 @@
           int c=p_GetComp(p,r);
           long sc = c;
-          int* Components = (_ExternalComponents ? _Components :
+          int* Components = (_componentsExternal ? _components :
                              o->data.syzcomp.Components);
-          long* ShiftedComponents = (_ExternalComponents ? _ShiftedComponents:
+          long* ShiftedComponents = (_componentsExternal ? _componentsShifted:
                                      o->data.syzcomp.ShiftedComponents);
           if (ShiftedComponents != NULL)
@@ -367 +367 @@
 void p_Setm_Syz(poly p, ring r, int* Components, long* ShiftedComponents)
 {
-  _Components = Components;
-  _ShiftedComponents = ShiftedComponents;
-  _ExternalComponents = 1;
+  _components = Components;
+  _componentsShifted = ShiftedComponents;
+  _componentsExternal = 1;
   p_Setm_General(p, r);
-  _ExternalComponents = 0;
+  _componentsExternal = 0;
 }