ad-hoc repair of DiffUtil::meanRelVecDiff

Device/IO/DiffUtil.cpp

@@ -27,8 +27,15 @@ double DiffUtil::meanRelVecDiff(const std::vector<double>& dat, const std::vecto
 {
     ASSERT(dat.size() == ref.size());
     double diff = 0;
-    for (size_t i = 0; i < dat.size(); ++i)
+    for (size_t i = 0; i < dat.size(); ++i) {
+	if (ref[i] == 0 && dat[i] == 0)
+	    continue;
+	if (ref[i] == 0 || dat[i] == 0) {
+	    std::cerr << "check manually at i=" << i << ": ref=" << ref[i] << " vs dat=" << dat[i] << "\n";
+	    continue;
+	}
         diff += Numeric::relativeDifference(dat[i], ref[i]);
+    }
     diff /= dat.size();
     ASSERT(std::isfinite(diff));
     return diff;

Tests/ReferenceData/MiniExamples/scatter2d/Resolution.1.int

@@ -7,11 +7,11 @@ EquiDivision("u (mm)", 7, 0, 107)
 EquiDivision("v (mm)", 11, 0, 140)
 
 # data
-6.974484032566e+00 3.695794633428e-02 2.377558900386e-02 1.833474147810e-02 7.548969752231e+00 4.862041428170e-02 3.061423693260e-02 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
-5.263550910517e-01 1.865828894268e-02 1.153317262768e-02 6.876254772596e-03 1.041951268165e+02 5.487718916224e-01 3.528127235842e-01 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
-2.719613729975e-01 2.080400986611e+01 2.422577958646e-01 1.463816900161e-01 7.624151503307e+00 1.511727246888e-01 5.447205768039e-02 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
-3.552020701315e-02 2.848949429459e+02 1.504418858488e+00 9.693734670764e-01 7.494610377175e-01 1.690859367489e+03 9.226493902518e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
-5.943576734232e+00 2.515605165543e+01 3.474859506952e+00 2.333414125238e+00 1.368971405679e+00 2.337236728300e+04 1.226163475538e+02 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
-7.923445881889e+01 6.158821458798e+01 6.670921354781e+01 3.134187628089e+01 1.825153348126e+01 1.698807555606e+03 1.162549826691e+01 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
-6.178385676186e+00 4.470269050410e+00 2.882146027174e+02 3.753478813397e+00 2.278703536009e+00 1.418377073991e+00 8.289809882657e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
+6.976986320957e+00 1.042312162488e+02 2.849809532829e+02 2.338056768865e+04 2.849809532829e+02 1.042312162488e+02 6.976986320957e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
+5.430263138483e-01 8.108220408659e+00 2.216470460208e+01 1.818420963941e+03 2.216470460208e+01 8.108220408659e+00 5.430263138483e-01 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
+2.778162096832e-02 4.118370874392e-01 1.126057867858e+00 9.255406769182e+01 1.126057867858e+00 4.118370874389e-01 2.778162096817e-02 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
+2.103468769170e-02 3.118115697721e-01 8.565510054254e-01 7.064205329445e+01 8.565510054256e-01 3.118115697725e-01 2.103468769184e-02 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
+1.554450451334e-02 2.305860885153e-01 6.375083729717e-01 5.281694625253e+01 6.375083729720e-01 2.305860885149e-01 1.554450451378e-02 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
+1.038814778097e-02 1.544257760316e-01 4.306014624859e-01 3.588310818329e+01 4.306014624855e-01 1.544257760321e-01 1.038814778120e-02 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
+5.952878903581e-03 8.893482470694e-02 2.507968724467e-01 2.105210246629e+01 2.507968724466e-01 8.893482470742e-02 5.952878903645e-03 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
 

Tests/ReferenceData/MiniExamples/scatter2d/Resolution.2.int

@@ -7,11 +7,11 @@ EquiDivision("u (mm)", 7, 0, 107)
 EquiDivision("v (mm)", 11, 0, 140)
 
 # data
-5.561615318236e+00 7.397072318363e-01 2.553433652307e-02 7.831758660370e-01 6.022460945594e+00 8.079996043494e-01 2.983796324095e-02 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
-4.213389716563e-01 6.945937287865e-02 1.882142563965e-02 1.058147235560e+01 8.308796803155e+01 1.104789979823e+01 3.438501176333e-01 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
-2.328141362689e+00 1.663060485577e+01 2.319841816403e+00 9.164214327270e-01 6.105792024198e+00 8.997821720978e-01 5.926301467346e-02 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
-2.894245101939e+01 2.271849071559e+02 3.021132827403e+01 1.134034890376e+00 1.723019908151e+02 1.348433270824e+03 1.789581596581e+02 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
-7.289674378258e+00 2.100252015999e+01 5.559469178334e+00 3.923829791540e+00 2.373402407000e+03 1.863767618207e+04 2.469777439795e+03 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
-6.939584898096e+01 6.389269355778e+01 6.259762906006e+01 3.371689190496e+01 1.901428514764e+02 1.356788869878e+03 1.816777303155e+02 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
-5.396525962190e+00 3.344054627795e+01 2.305091391788e+02 3.247371078293e+01 2.360688543948e+00 2.203136508359e+00 6.750131050555e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
+1.615746226033e+01 1.142628047354e+02 2.610593626071e+03 1.868948707201e+04 2.610593626071e+03 1.142628047354e+02 1.615746226032e+01 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
+1.257124588644e+00 8.888165671472e+00 2.030390605013e+02 1.453572778303e+03 2.030390605013e+02 8.888165671474e+00 1.257124588644e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
+6.401189135893e-02 4.515116843287e-01 1.033254451688e+01 7.398358643271e+01 1.033254451688e+01 4.515116843275e-01 6.401189135863e-02 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
+4.846563244377e-02 3.422928702179e-01 7.883753622371e+00 5.646750919327e+01 7.883753622372e+00 3.422928702177e-01 4.846563244359e-02 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
+3.583227104000e-02 2.535794178336e-01 5.891869459672e+00 4.221847356810e+01 5.891869459672e+00 2.535794178336e-01 3.583227104014e-02 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
+2.397981180647e-02 1.702277707279e-01 4.000626042071e+00 2.868214095883e+01 4.000626042071e+00 1.702277707281e-01 2.397981180679e-02 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
+1.378663437678e-02 9.834353341133e-02 2.345481640649e+00 1.682702692716e+01 2.345481640649e+00 9.834353341094e-02 1.378663437692e-02 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00