diff --git a/src/do b/src/do index b4bf2e8b6..cd18c140e 100644 --- a/src/do +++ b/src/do @@ -1,3 +1,10 @@ +// (c) Thales group, 2010 +/* + Authors: + Johann Dreo + Caner Candan +*/ + #ifndef _do_ #define _do_ diff --git a/src/do.cpp b/src/do.cpp index b33d98fe5..082374a40 100644 --- a/src/do.cpp +++ b/src/do.cpp @@ -1 +1,8 @@ +// (c) Thales group, 2010 +/* + Authors: + Johann Dreo + Caner Candan +*/ + #include "do" diff --git a/src/doAlgo.h b/src/doAlgo.h index 54ea1698f..0f260d933 100644 --- a/src/doAlgo.h +++ b/src/doAlgo.h @@ -1,3 +1,10 @@ +// (c) Thales group, 2010 +/* + Authors: + Johann Dreo + Caner Candan +*/ + #ifndef _doAlgo_h #define _doAlgo_h diff --git a/src/doBounder.h b/src/doBounder.h index 28996474c..3ce4a5543 100644 --- a/src/doBounder.h +++ b/src/doBounder.h @@ -1,3 +1,10 @@ +// (c) Thales group, 2010 +/* + Authors: + Johann Dreo + Caner Candan +*/ + #ifndef _doBounder_h #define _doBounder_h diff --git a/src/doBounderBound.h b/src/doBounderBound.h index a284d2cbe..cff765b8e 100644 --- a/src/doBounderBound.h +++ b/src/doBounderBound.h @@ -1,3 +1,10 @@ +// (c) Thales group, 2010 +/* + Authors: + Johann Dreo + Caner Candan +*/ + #ifndef _doBounderBound_h #define _doBounderBound_h diff --git a/src/doBounderNo.h b/src/doBounderNo.h index 36e34451a..94d873a83 100644 --- a/src/doBounderNo.h +++ b/src/doBounderNo.h @@ -1,3 +1,10 @@ +// (c) Thales group, 2010 +/* + Authors: + Johann Dreo + Caner Candan +*/ + #ifndef _doBounderNo_h #define _doBounderNo_h diff --git a/src/doBounderRng.h b/src/doBounderRng.h index 2f2450bc7..52b95bcac 100644 --- a/src/doBounderRng.h +++ b/src/doBounderRng.h @@ -1,3 +1,10 @@ +// (c) Thales group, 2010 +/* + Authors: + Johann Dreo + Caner Candan +*/ + #ifndef _doBounderRng_h #define _doBounderRng_h diff --git a/src/doCMASA.h b/src/doCMASA.h index 45b067057..1536f08f6 100644 --- a/src/doCMASA.h +++ b/src/doCMASA.h @@ -1,3 +1,10 @@ +// (c) Thales group, 2010 +/* + Authors: + Johann Dreo + Caner Candan +*/ + #ifndef _doCMASA_h #define _doCMASA_h diff --git a/src/doCheckPoint.h b/src/doCheckPoint.h index 79a2cfe80..d424e1843 100644 --- a/src/doCheckPoint.h +++ b/src/doCheckPoint.h @@ -1,3 +1,10 @@ +// (c) Thales group, 2010 +/* + Authors: + Johann Dreo + Caner Candan +*/ + #ifndef _doCheckPoint_h #define _doCheckPoint_h diff --git a/src/doContinue.h b/src/doContinue.h index f0b56dafb..a93de093c 100644 --- a/src/doContinue.h +++ b/src/doContinue.h @@ -1,3 +1,10 @@ +// (c) Thales group, 2010 +/* + Authors: + Johann Dreo + Caner Candan +*/ + #ifndef _doContinue_h #define _doContinue_h diff --git a/src/doDistrib.h b/src/doDistrib.h index 71c2f6f1c..15b051f8f 100644 --- a/src/doDistrib.h +++ b/src/doDistrib.h @@ -1,3 +1,10 @@ +// (c) Thales group, 2010 +/* + Authors: + Johann Dreo + Caner Candan +*/ + #ifndef _doDistrib_h #define _doDistrib_h diff --git a/src/doEstimator.h b/src/doEstimator.h index 682dd3f76..956bed78b 100644 --- a/src/doEstimator.h +++ b/src/doEstimator.h @@ -1,3 +1,10 @@ +// (c) Thales group, 2010 +/* + Authors: + Johann Dreo + Caner Candan +*/ + #ifndef _doEstimator_h #define _doEstimator_h diff --git a/src/doEstimatorNormalMono.h b/src/doEstimatorNormalMono.h index c6e168b77..fb9c1f2fd 100644 --- a/src/doEstimatorNormalMono.h +++ b/src/doEstimatorNormalMono.h @@ -1,3 +1,10 @@ +// (c) Thales group, 2010 +/* + Authors: + Johann Dreo + Caner Candan +*/ + #ifndef _doEstimatorNormalMono_h #define _doEstimatorNormalMono_h diff --git a/src/doEstimatorNormalMulti.h b/src/doEstimatorNormalMulti.h index 63df56062..e1c907b27 100644 --- a/src/doEstimatorNormalMulti.h +++ b/src/doEstimatorNormalMulti.h @@ -1,3 +1,10 @@ +// (c) Thales group, 2010 +/* + Authors: + Johann Dreo + Caner Candan +*/ + #ifndef _doEstimatorNormalMulti_h #define _doEstimatorNormalMulti_h @@ -39,19 +46,10 @@ public: //------------------------------------------------------------- // variance-covariance matrix are symmetric (and semi-definite // positive), thus a triangular storage is sufficient + // + // variance-covariance matrix computation : transpose(A) * A //------------------------------------------------------------- - //ublas::symmetric_matrix< AtomType, ublas::lower > var; //(s_size, s_size); - - //------------------------------------------------------------- - - - //------------------------------------------------------------- - // variance-covariance matrix computation : A * transpose(A) - //------------------------------------------------------------- - - //ublas::matrix< AtomType > var = ublas::prod( sample, ublas::trans( sample ) ); - //ublas::symmetric_matrix< AtomType, ublas::lower > var = ublas::prod( sample, ublas::trans( sample ) ); ublas::symmetric_matrix< AtomType, ublas::lower > var = ublas::prod( ublas::trans( sample ), sample ); assert(var.size1() == s_size); @@ -59,9 +57,6 @@ public: assert(var.size1() == _varcovar.size1()); assert(var.size2() == _varcovar.size2()); - std::cout << "_varcovar: " << _varcovar << std::endl; - std::cout << "var: " << var << std::endl; - //------------------------------------------------------------- @@ -71,7 +66,6 @@ public: // for (unsigned int j = 0; j <= i; ++j) // { // // we want a reducted covariance matrix - // std::cout << "i " << i << " j " << j << std::endl; // _varcovar(i, j) = var(i, j) / p_size; // } // } diff --git a/src/doEstimatorUniform.h b/src/doEstimatorUniform.h index 8f9b35519..ca361ce00 100644 --- a/src/doEstimatorUniform.h +++ b/src/doEstimatorUniform.h @@ -1,3 +1,10 @@ +// (c) Thales group, 2010 +/* + Authors: + Johann Dreo + Caner Candan +*/ + #ifndef _doEstimatorUniform_h #define _doEstimatorUniform_h diff --git a/src/doHyperVolume.h b/src/doHyperVolume.h index c47f457b5..2a1be37fb 100644 --- a/src/doHyperVolume.h +++ b/src/doHyperVolume.h @@ -1,3 +1,10 @@ +// (c) Thales group, 2010 +/* + Authors: + Johann Dreo + Caner Candan +*/ + #ifndef _doHyperVolume_h #define _doHyperVolume_h diff --git a/src/doModifier.h b/src/doModifier.h index 9c28f9967..b36106c98 100644 --- a/src/doModifier.h +++ b/src/doModifier.h @@ -1,3 +1,10 @@ +// (c) Thales group, 2010 +/* + Authors: + Johann Dreo + Caner Candan +*/ + #ifndef _doModifier_h #define _doModifier_h diff --git a/src/doModifierDispersion.h b/src/doModifierDispersion.h index 2632757b5..4d5e42c46 100644 --- a/src/doModifierDispersion.h +++ b/src/doModifierDispersion.h @@ -1,3 +1,10 @@ +// (c) Thales group, 2010 +/* + Authors: + Johann Dreo + Caner Candan +*/ + #ifndef _doModifierDispersion_h #define _doModifierDispersion_h diff --git a/src/doModifierMass.h b/src/doModifierMass.h index 411c3f297..4f5df5c0a 100644 --- a/src/doModifierMass.h +++ b/src/doModifierMass.h @@ -1,3 +1,10 @@ +// (c) Thales group, 2010 +/* + Authors: + Johann Dreo + Caner Candan +*/ + #ifndef _doModifierMass_h #define _doModifierMass_h diff --git a/src/doNormalMono.h b/src/doNormalMono.h index 6fb0b9b74..fa8f8e6f4 100644 --- a/src/doNormalMono.h +++ b/src/doNormalMono.h @@ -1,3 +1,10 @@ +// (c) Thales group, 2010 +/* + Authors: + Johann Dreo + Caner Candan +*/ + #ifndef _doNormalMono_h #define _doNormalMono_h diff --git a/src/doNormalMonoCenter.h b/src/doNormalMonoCenter.h index 48b448a42..7786d347c 100644 --- a/src/doNormalMonoCenter.h +++ b/src/doNormalMonoCenter.h @@ -1,3 +1,10 @@ +// (c) Thales group, 2010 +/* + Authors: + Johann Dreo + Caner Candan +*/ + #ifndef _doNormalMonoCenter_h #define _doNormalMonoCenter_h diff --git a/src/doNormalMulti.h b/src/doNormalMulti.h index 50082efbe..1b3e3f16c 100644 --- a/src/doNormalMulti.h +++ b/src/doNormalMulti.h @@ -1,3 +1,10 @@ +// (c) Thales group, 2010 +/* + Authors: + Johann Dreo + Caner Candan +*/ + #ifndef _doNormalMulti_h #define _doNormalMulti_h diff --git a/src/doNormalMultiCenter.h b/src/doNormalMultiCenter.h index 65e9ec7cc..bf52ecf13 100644 --- a/src/doNormalMultiCenter.h +++ b/src/doNormalMultiCenter.h @@ -1,3 +1,10 @@ +// (c) Thales group, 2010 +/* + Authors: + Johann Dreo + Caner Candan +*/ + #ifndef _doNormalMultiCenter_h #define _doNormalMultiCenter_h diff --git a/src/doSampler.h b/src/doSampler.h index 1bb66b44a..636412476 100644 --- a/src/doSampler.h +++ b/src/doSampler.h @@ -1,3 +1,10 @@ +// (c) Thales group, 2010 +/* + Authors: + Johann Dreo + Caner Candan +*/ + #ifndef _doSampler_h #define _doSampler_h diff --git a/src/doSamplerNormalMono.h b/src/doSamplerNormalMono.h index 105926826..b790ee6b0 100644 --- a/src/doSamplerNormalMono.h +++ b/src/doSamplerNormalMono.h @@ -1,3 +1,10 @@ +// (c) Thales group, 2010 +/* + Authors: + Johann Dreo + Caner Candan +*/ + #ifndef _doSamplerNormalMono_h #define _doSamplerNormalMono_h diff --git a/src/doSamplerNormalMulti.h b/src/doSamplerNormalMulti.h index 3164af3fa..2378634a5 100644 --- a/src/doSamplerNormalMulti.h +++ b/src/doSamplerNormalMulti.h @@ -1,3 +1,10 @@ +// (c) Thales group, 2010 +/* + Authors: + Johann Dreo + Caner Candan +*/ + #ifndef _doSamplerNormalMulti_h #define _doSamplerNormalMulti_h @@ -66,10 +73,6 @@ public: sum += _L(i, k) * _L(i, k); } - // assert( ( V(i, i) - sum ) > 0 ); - - //_L(i, i) = sqrt( V(i, i) - sum ); - _L(i,i) = sqrt( fabs( V(i,i) - sum) ); for ( j = i + 1; j < Vl; ++j ) // rows diff --git a/src/doSamplerUniform.h b/src/doSamplerUniform.h index 374d7a8e9..e407360dd 100644 --- a/src/doSamplerUniform.h +++ b/src/doSamplerUniform.h @@ -1,3 +1,10 @@ +// (c) Thales group, 2010 +/* + Authors: + Johann Dreo + Caner Candan +*/ + #ifndef _doSamplerUniform_h #define _doSamplerUniform_h diff --git a/src/doStat.h b/src/doStat.h index a6ac76e50..5a6056a9f 100644 --- a/src/doStat.h +++ b/src/doStat.h @@ -1,3 +1,10 @@ +// (c) Thales group, 2010 +/* + Authors: + Johann Dreo + Caner Candan +*/ + #ifndef _doStat_h #define _doStat_h diff --git a/src/doStatNormalMono.h b/src/doStatNormalMono.h index 7259f2944..1eab0d53d 100644 --- a/src/doStatNormalMono.h +++ b/src/doStatNormalMono.h @@ -1,3 +1,10 @@ +// (c) Thales group, 2010 +/* + Authors: + Johann Dreo + Caner Candan +*/ + #ifndef _doStatNormalMono_h #define _doStatNormalMono_h diff --git a/src/doStatNormalMulti.h b/src/doStatNormalMulti.h index 7c3cb8e03..d433e40e2 100644 --- a/src/doStatNormalMulti.h +++ b/src/doStatNormalMulti.h @@ -1,3 +1,10 @@ +// (c) Thales group, 2010 +/* + Authors: + Johann Dreo + Caner Candan +*/ + #ifndef _doStatNormalMulti_h #define _doStatNormalMulti_h diff --git a/src/doStatUniform.h b/src/doStatUniform.h index 442ef5f8e..808750f7f 100644 --- a/src/doStatUniform.h +++ b/src/doStatUniform.h @@ -1,3 +1,10 @@ +// (c) Thales group, 2010 +/* + Authors: + Johann Dreo + Caner Candan +*/ + #ifndef _doStatUniform_h #define _doStatUniform_h diff --git a/src/doUniform.h b/src/doUniform.h index 6bfd90160..624fec1fa 100644 --- a/src/doUniform.h +++ b/src/doUniform.h @@ -1,3 +1,10 @@ +// (c) Thales group, 2010 +/* + Authors: + Johann Dreo + Caner Candan +*/ + #ifndef _doUniform_h #define _doUniform_h diff --git a/src/doUniformCenter.h b/src/doUniformCenter.h index 74864d8b2..8b0016bc6 100644 --- a/src/doUniformCenter.h +++ b/src/doUniformCenter.h @@ -1,3 +1,10 @@ +// (c) Thales group, 2010 +/* + Authors: + Johann Dreo + Caner Candan +*/ + #ifndef _doUniformCenter_h #define _doUniformCenter_h diff --git a/src/doVectorBounds.h b/src/doVectorBounds.h index 027880469..4e23d4863 100644 --- a/src/doVectorBounds.h +++ b/src/doVectorBounds.h @@ -1,3 +1,10 @@ +// (c) Thales group, 2010 +/* + Authors: + Johann Dreo + Caner Candan +*/ + #ifndef _doVectorBounds_h #define _doVectorBounds_h diff --git a/src/todo b/src/todo deleted file mode 100644 index 13785cc8e..000000000 --- a/src/todo +++ /dev/null @@ -1,2 +0,0 @@ -* deplacer les ecritures pour gnuplot dans des classes type eoContinue (eoMonitor) -* integrer ACP