From 8d7bbe7947e80a7a9c5165ad6fb06323f6a85b80 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (laptop)" <j.wuttke@fz-juelich.de>
Date: Fri, 1 Mar 2013 00:24:22 +0100
Subject: [PATCH] ..
---
pub/src/expr.h | 16 ++++++++--------
pub/src/manip.cpp | 12 ------------
pub/src/olf.h | 18 +++++++++---------
3 files changed, 17 insertions(+), 29 deletions(-)
diff --git a/pub/src/expr.h b/pub/src/expr.h
index b6c11bbf..d85a8acf 100644
--- a/pub/src/expr.h
+++ b/pub/src/expr.h
@@ -45,21 +45,21 @@ class CResult {
vector<double> v;
vector<double> dv;
- CResult() : vectorial(false), dr(0) {};
+ CResult() : vectorial(false), dr(0) {}
void set_r( double _r ) {
- vectorial = false; r = _r; };
+ vectorial = false; r = _r; }
void preset_v( int n ) {
- vectorial = true; v.resize(n); };
+ vectorial = true; v.resize(n); }
void set_v( const vector<double>& _v ) {
- vectorial = true; v = _v; };
+ vectorial = true; v = _v; }
double to_r( int i ) const {
- return vectorial ? v[i] : r; };
+ return vectorial ? v[i] : r; }
double to_dr( int i ) const {
- return vectorial ? ( dv.size() ? dv[i] : 0 ) : dr; };
+ return vectorial ? ( dv.size() ? dv[i] : 0 ) : dr; }
bool has_err() const {
- return vectorial ? dv.size() : dr; };
+ return vectorial ? dv.size() : dr; }
string result_info() const;
};
@@ -74,7 +74,7 @@ class CRef {
PNode ti;
CRef( PNode _tk=PNode(), PNode _tj=PNode(), PNode _ti=PNode() )
- : tk(_tk), tj(_tj), ti(_ti) {};
+ : tk(_tk), tj(_tj), ti(_ti) {}
uint get_k( const CContext& ctx ) const;
uint get_j( const CContext& ctx, uint nj ) const;
diff --git a/pub/src/manip.cpp b/pub/src/manip.cpp
index 1c732be7..5f4c6eaa 100644
--- a/pub/src/manip.cpp
+++ b/pub/src/manip.cpp
@@ -71,7 +71,6 @@ void NManip::ProtectSpecs( bool on )
void NManip::PtsSelect( bool sel_del )
{
NOlm::IterateD fiter;
-
static string pSel = "";
pSel = wask( string( sel_del ? "Delete" : "Retain" ) +
" which points", pSel );
@@ -161,7 +160,6 @@ void NManip::PtsAvge()
void NManip::PtsAvgeFixed()
{
NOlm::IterateD fiter;
-
static int ng=2;
ng = iask( "Number of points per bin", ng );
if ( ng<1 )
@@ -204,7 +202,6 @@ void NManip::PtsAvgeFixed()
void NManip::PtsAvgeByErr( const string& subcmd )
{
NOlm::IterateD fiter;
-
bool mode_abs;
if ( subcmd=="a" )
mode_abs = true;
@@ -263,7 +260,6 @@ void NManip::PtsAvgeByErr( const string& subcmd )
void NManip::PtsSort()
{
NOlm::IterateD fiter;
-
string expr = sask("Sort points according to");
if (expr=="") return;
PNode T = user_xaxparse( expr.c_str() );
@@ -348,7 +344,6 @@ void NManip::PtsAvgeEq(void)
void NManip::PtsSymmetrize()
{
NOlm::IterateD fiter;
-
static string expr = "0";
expr = sask( "Assume symmetry with mirror positioned at", expr );
if ( expr=="" ) return;
@@ -560,7 +555,6 @@ void NManip::ScaAvge()
void NManip::ScaJoin()
{
NOlm::IterateD fiter;
-
CList JSel;
static string jSel = "";
JSelAsk( "Start groups at spectra", &jSel, &JSel );
@@ -599,7 +593,6 @@ void NManip::ScaJoin()
void NManip::ScaSpawn()
{
NOlm::IterateO fiter;
-
static int njj = 2;
int njjIn = iask("output will have how many copies of input spectrum", njj);
if (njjIn<1) return;
@@ -707,7 +700,6 @@ void NManip::ScaExch()
void NManip::ScaSortByExpr()
{
NOlm::IterateO fiter;
-
string expr = sask("Sort spectra according to");
if (expr=="") return;
PNode T = user_xaxparse( expr.c_str() );
@@ -752,7 +744,6 @@ void NManip::ScaSortByZ()
void NManip::ZExchange()
{
NOlm::IterateO fiter;
-
int nzmin, nzmax = 0;
char mod;
string com;
@@ -855,7 +846,6 @@ void NManip::ZExchange()
void NManip::ZDelete()
{
NOlm::IterateO fiter;
-
string sel;
sel = wask( "List of z coordinates to be removed" );
if ( sel=="-" )
@@ -934,7 +924,6 @@ void NManip::ScaBreak()
void NManip::FilMerge( const string& opts )
{
NOlm::IterateO fiter;
-
// parse options:
bool add_zk = false;
if ( opts=="+" )
@@ -1088,7 +1077,6 @@ void NManip::FilMerge( const string& opts )
void NManip::FilMergePointwise()
{
NOlm::IterateD fiter;
-
// Copy first input file:
POld fin = fiter();
POld fout( fin->new_old() );
diff --git a/pub/src/olf.h b/pub/src/olf.h
index d1cb7c5b..5b41c468 100644
--- a/pub/src/olf.h
+++ b/pub/src/olf.h
@@ -26,18 +26,18 @@ class COlo {
// Online state records:
bool as_on_disk;
- COlo() : as_on_disk(false) {};
- virtual ~COlo() {}; ///< magic: makes dynamic_cast possible
+ COlo() : as_on_disk(false) {}
+ virtual ~COlo() {} ///< magic: makes dynamic_cast possible
- void clear() { V.clear(); };
- void remove( uint j ) { V.erase( V.begin()+j ); };
+ void clear() { V.clear(); }
+ void remove( uint j ) { V.erase( V.begin()+j ); }
void remove_z( uint iz );
string infoLine( uint j ) const;
virtual void copy_mainvec( POlo fin ) = 0;
- uint nJ() const { return V.size(); };
- uint nZ() const { return ZCo.size(); };
+ uint nJ() const { return V.size(); }
+ uint nZ() const { return ZCo.size(); }
double z( uint j, uint iz ) const;
virtual PZentry new_zentry( uint j ) const = 0;
virtual POlo new_olo( bool modified=true ) const = 0;
@@ -50,7 +50,7 @@ class COlo {
class COld : public COlo {
public:
- COld() {};
+ COld() {}
COld( class COlc const* fc );
// Trivially duplicated functions:
@@ -64,7 +64,7 @@ class COld : public COlo {
uint nPts(uint j) const;
uint nPts() const; // 0 unless all spectra j have same nPts(j)
CCoord coord( class CVar* var ) const;
- void setCoord( class CVar* var, CCoord& co ) ;
+ void setCoord( class CVar* var, CCoord& co );
};
@@ -97,7 +97,7 @@ class COlc : public COlo {
PNode range_T; ///< Restricts points to be fitted (parsed tree).
COlc() :
- kconv(-1), weighing( _ERR ), plot_to_grid( false ), range_expr("") {};
+ kconv(-1), weighing( _ERR ), plot_to_grid( false ), range_expr("") {}
// Trivially duplicated functions:
PCurve VC( uint j ) const;
--
GitLab