diff --git a/pub/lib/calc.cpp b/pub/lib/calc.cpp index 3aa7da7a097dde437bce447a52248b49f23342da..c75c999ba1244089f0061c56b34940f43fe5b2e3 100644 --- a/pub/lib/calc.cpp +++ b/pub/lib/calc.cpp @@ -7,6 +7,7 @@ //! \file calc.cpp //! \brief NCalc::Calculator: the command-line pocket calculator. + #include <memory> #include <string> #include <vector> diff --git a/pub/lib/coord.cpp b/pub/lib/coord.cpp index e13a1e5bfe7424487d156441af8a58f33b6ead4f..378d3eb0e0630fe27030a999aed887348f0fbb55 100644 --- a/pub/lib/coord.cpp +++ b/pub/lib/coord.cpp @@ -7,6 +7,7 @@ //! \file coord.cpp //! \brief Coordinates CCoord, numeric parameters CParam. + #include <cstring> #include <iostream> @@ -128,13 +129,6 @@ string CCoord::str_ps() const // two blanks instead of one, and no unit "" return name + ( unit!="" ? (" (" + unit + ")") : ""); } -//! Format for saving in a01 format. - -string CCoord::to_a01() const -{ - return name + "\t" + unit; -} - //! Parse old a01 format. string CCoord::load_a01(string in) @@ -167,4 +161,3 @@ ostream& operator<< (ostream &s, CCoord C) { return s << C.str_std(); } - diff --git a/pub/lib/coord.hpp b/pub/lib/coord.hpp index e0854b3b283f5878f02452b428e96758d5485a34..6560e239fed3f3008820a9e18c815c156d9d045f 100644 --- a/pub/lib/coord.hpp +++ b/pub/lib/coord.hpp @@ -58,5 +58,3 @@ class CParam { CParam( string _name, string _unit="", double _val=0, double _dval=0 ) : Co( CCoord(_name, _unit) ), val(_val), dval(_dval) {} }; - - diff --git a/pub/lib/func.hpp b/pub/lib/func.hpp index 884e2b2f7d17a1f6d798859d1e69130371b00417..d75acefbe08d63505b72b130f415ae1903fc6ef4 100644 --- a/pub/lib/func.hpp +++ b/pub/lib/func.hpp @@ -35,6 +35,8 @@ class CFunc { void register_me() const; }; +//! Wrapping a function with 1 argument. + class CFunc1 : public CFunc { public: func_f1 f1; @@ -44,6 +46,8 @@ class CFunc1 : public CFunc { class CCoord coord( class CCoord *co ) const; }; +//! Wrapping a function with 2 arguments. + class CFunc2 : public CFunc { public: func_f2 f2; @@ -53,6 +57,8 @@ class CFunc2 : public CFunc { class CCoord coord( class CCoord *co1, class CCoord *co2 ) const; }; +//! Wrapping a function with 3 arguments. + class CFunc3 : public CFunc { public: func_f3 f3; diff --git a/pub/lib/list.cpp b/pub/lib/list.cpp index 973e8a86b723ac9c5c4443ff123d81ed900e7f88..8e8bacd1a1720c45e4bcbcb001432b90398dfa70 100644 --- a/pub/lib/list.cpp +++ b/pub/lib/list.cpp @@ -5,7 +5,8 @@ //***************************************************************************// //! \file list.cpp -//! \brief index collection CList +//! \brief index collection CList. + #include <algorithm> @@ -290,4 +291,3 @@ int CList::parseListvalue( string inp, int which ) + S(inf) + "," + S((int)sup) + ")"; return val; } - diff --git a/pub/lib/list.hpp b/pub/lib/list.hpp index aebe498fe8bd41146ce547898225ed017adf5d3f..6ed62dd13d13ab010d99232fa3a175c27f137792 100644 --- a/pub/lib/list.hpp +++ b/pub/lib/list.hpp @@ -5,7 +5,7 @@ //***************************************************************************// //! \file list.hpp -//! \brief index collection CList +//! \brief index collection CList. //! An index collection (a sequence of non-negative integers). @@ -80,4 +80,3 @@ private: string sel2text() const; }; - diff --git a/pub/lib/opr.cpp b/pub/lib/opr.cpp index 3ef3e56a500d896c6aa449b52eb72a838e2f8672..6d3b5b9217f379a980bf527d284c85ec3c984839 100644 --- a/pub/lib/opr.cpp +++ b/pub/lib/opr.cpp @@ -5,7 +5,8 @@ //***************************************************************************// //! \file opr.cpp -//! \brief NOperate, NIntOld: functional operations +//! \brief NOperate: functional operations. + #include <iostream> #include <boost/format.hpp> @@ -25,10 +26,12 @@ using boost::format; + //***************************************************************************// //* operate via generic expressions *// //***************************************************************************// + //! Display data. Use boolean expression to display only a subset of the data. void NOperate::show( const string& subcmd ) @@ -451,4 +454,3 @@ void NOperate::Functional( const string& subcmd ) NOlm::mem_store( fout, fiter.k() ); } } - diff --git a/pub/lib/opr.hpp b/pub/lib/opr.hpp index 00b9ba1ceaf8dc367470cae45621ab1d546539f6..6f66c1100c4ff316efcb675221533524ba9f6840 100644 --- a/pub/lib/opr.hpp +++ b/pub/lib/opr.hpp @@ -5,7 +5,7 @@ //***************************************************************************// //! \file opr.hpp -//! \brief NOperate, NIntOld: functional operations +//! \brief NOperate: functional operations. //! Functional operations. diff --git a/pub/lib/plot.cpp b/pub/lib/plot.cpp index aeee6122204555f2c29297c984bb703e9aaca598..4e3aeae1d9ddbef89223246a27aa99c6d6d2d2a5 100644 --- a/pub/lib/plot.cpp +++ b/pub/lib/plot.cpp @@ -5,7 +5,8 @@ //***************************************************************************// //! \file plot.cpp -//! \brief NPlot: plot data and curves +//! \brief NPlot: plot data and curves. + #include <iostream> #include <vector> @@ -23,10 +24,12 @@ #include "plot.hpp" #include "curve.hpp" + //**************************************************************************// //* Subroutines: determine data ranges *// //**************************************************************************// + //! Loop over selected data files to determine x range. void determine_Xrange( CPlot* plot, CList* JSel ) @@ -59,6 +62,7 @@ void determine_Xrange( CPlot* plot, CList* JSel ) plot->X.setRoundedLimits( inf, sup ); } + //! Loop over selected files to determine y range for current x range. void determine_Yrange( CPlot* plot, CList* JSel ) @@ -103,6 +107,7 @@ void determine_Yrange( CPlot* plot, CList* JSel ) //* Subroutines: plot one scan *// //**************************************************************************// + //! Plot scan j of data file fd; return number of points plotted. int plot_data( CPlot* plot, POld fd, int k, int j, int pstyle ) @@ -172,6 +177,7 @@ int plot_data( CPlot* plot, POld fd, int k, int j, int pstyle ) return np; } + //! Plot scan j of convolved curve file fc; return number of points plotted. int plot_curve_convolved( CPlot* plot, POlc fc, int k, int j, int cstyle ) @@ -231,8 +237,8 @@ int plot_curve_to_grid( CPlot* plot, POlc fc, int k, int j, int cstyle ) return xp.size(); } -//! Plot scan j of non-convolved curve file fc on equidistant grid; -//! return number of points plotted. + +//! Plot scan j of non-convolved curve file fc on equidistant grid; return number of points plotted. int plot_curve_equidist( CPlot* plot, POlc fc, int k, int j, int cstyle ) { @@ -255,8 +261,7 @@ int plot_curve_equidist( CPlot* plot, POlc fc, int k, int j, int cstyle ) return xp.size(); } -//! Plot scan j of non-convolved curve file fc, refining the grid where -//! necessary; return number of points plotted. +//! Plot scan j of non-convolved curve file fc, refining the grid where necessary; return number of points plotted. int plot_curve_refine( CPlot* plot, POlc fc, int k, int j, int cstyle ) { @@ -513,4 +518,3 @@ void NPlot::Plot( class CPlot *plot, bool add, const string& mode ) } plot->showSpecs(); } - diff --git a/pub/lib/plot.hpp b/pub/lib/plot.hpp index b6a9baa8ffa0a1d072649df00ccd624be6971055..1fe52e768078c8a0e205304eabfbf155d9ea5cbb 100644 --- a/pub/lib/plot.hpp +++ b/pub/lib/plot.hpp @@ -5,11 +5,11 @@ //***************************************************************************// //! \file plot.hpp -//! \brief NPlot: plot data and curves +//! \brief NPlot: plot data and curves. + //! Plot data and curves. namespace NPlot { void Plot( class CPlot *plot, bool add, const string& mode="ask" ); } - diff --git a/pub/lib/special.cpp b/pub/lib/special.cpp index bfdfec912515b691db713c8f56132ee88c32a985..7315677abf5a258b789c542656b43df70b79743d 100644 --- a/pub/lib/special.cpp +++ b/pub/lib/special.cpp @@ -7,6 +7,7 @@ //! \file special.cpp //! \brief NSpecial: this and that, written ad hoc. + #include <iostream> #include <fftw3.h> #include <string> @@ -114,4 +115,3 @@ void NSpecial::Test() } NOlm::mem_store( fout ); } - diff --git a/pub/lib/special.hpp b/pub/lib/special.hpp index 7b52c22479098fc2f789b058e5b7f5913cb911f2..c8b7dcbeed917c16c5a53e158fe9d6432488cbeb 100644 --- a/pub/lib/special.hpp +++ b/pub/lib/special.hpp @@ -7,6 +7,7 @@ //! \file special.hpp //! \brief NSpecial: this and that, written ad hoc. + // What falls out of use goes to ../../arch/one-time-routines/ //! This and that, written ad hoc. @@ -15,4 +16,3 @@ namespace NSpecial { void FourierCosine(); void Test(); } - diff --git a/pub/lib/toplevel.hpp b/pub/lib/toplevel.hpp index 60489fbc90d8f6d884037ef2ab07e6805f6a02c0..3a7f0583b73a9f1fca7c18455a0197fb5336ed88 100644 --- a/pub/lib/toplevel.hpp +++ b/pub/lib/toplevel.hpp @@ -9,6 +9,8 @@ #include <time.h> +//! Execution context. + class CFrida { public: CFrida();