Skip to content

Commit 21910db

Browse files
dcwhitedcwhite
committed
Fix Windows compile; delete some unused code
1 parent 11d74c2 commit 21910db

File tree

11 files changed

+64
-439
lines changed

11 files changed

+64
-439
lines changed

‎src/Core/Algorithms/Legacy/Fields/Mapping/MappingDataSource.cc‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2184,23 +2184,23 @@ class ClosestNodeGradientSource : public MappingDataSource {
21842184
{
21852185
double l = 1.0/(points_[j]-r).length();
21862186

2187-
double dx = Abs(points_[j].x()-r.x());
2187+
double dx = std::fabs(points_[j].x() - r.x());
21882188
double xw = l*dx;
21892189
if (xw > 1e-3)
21902190
{
21912191
data[0] += xw*(val-values_[j])/(r.x()-points_[j].x());
21922192
sxw += xw;
21932193
}
21942194

2195-
double dy = Abs(points_[j].y()-r.y());
2195+
double dy = std::fabs(points_[j].y() - r.y());
21962196
double yw = l*dy;
21972197
if (yw > 1e-3)
21982198
{
21992199
data[1] += yw*(val-values_[j])/(r.y()-points_[j].y());
22002200
syw += yw;
22012201
}
22022202

2203-
double dz = Abs(points_[j].z()-r.z());
2203+
double dz = std::fabs(points_[j].z()-r.z());
22042204
double zw = l*dz;
22052205
if (zw > 1e-3)
22062206
{
@@ -2243,23 +2243,23 @@ class ClosestNodeGradientSource : public MappingDataSource {
22432243
{
22442244
double l = 1.0/(points_[j]-r).length();
22452245

2246-
double dx = Abs(points_[j].x()-r.x());
2246+
double dx = std::fabs(points_[j].x()-r.x());
22472247
double xw = l*dx;
22482248
if (xw > 1e-3)
22492249
{
22502250
data[k][0] += xw*(val-values_[j])/(r.x()-points_[j].x());
22512251
sxw += xw;
22522252
}
22532253

2254-
double dy = Abs(points_[j].y()-r.y());
2254+
double dy = std::fabs(points_[j].y()-r.y());
22552255
double yw = l*dy;
22562256
if (yw > 1e-3)
22572257
{
22582258
data[k][1] += yw*(val-values_[j])/(r.y()-points_[j].y());
22592259
syw += yw;
22602260
}
22612261

2262-
double dz = Abs(points_[j].z()-r.z());
2262+
double dz = std::fabs(points_[j].z()-r.z());
22632263
double zw = l*dz;
22642264
if (zw > 1e-3)
22652265
{
@@ -2335,23 +2335,23 @@ class ClosestNodeWeightedGradientSource : public MappingDataSource {
23352335
{
23362336
double l = 1.0/(points_[j]-r).length();
23372337

2338-
double dx = Abs(points_[j].x()-r.x());
2338+
double dx = std::fabs(points_[j].x() - r.x());
23392339
double xw = l*dx;
23402340
if (xw > 1e-3)
23412341
{
23422342
data[0] += xw*(val-values_[j])/(r.x()-points_[j].x());
23432343
sxw += xw;
23442344
}
23452345

2346-
double dy = Abs(points_[j].y()-r.y());
2346+
double dy = std::fabs(points_[j].y() - r.y());
23472347
double yw = l*dy;
23482348
if (yw > 1e-3)
23492349
{
23502350
data[1] += yw*(val-values_[j])/(r.y()-points_[j].y());
23512351
syw += yw;
23522352
}
23532353

2354-
double dz = Abs(points_[j].z()-r.z());
2354+
double dz = std::fabs(points_[j].z() - r.z());
23552355
double zw = l*dz;
23562356
if (zw > 1e-3)
23572357
{
@@ -2404,23 +2404,23 @@ class ClosestNodeWeightedGradientSource : public MappingDataSource {
24042404
{
24052405
double l = 1.0/(points_[j]-r).length();
24062406

2407-
double dx = Abs(points_[j].x()-r.x());
2407+
double dx = std::fabs(points_[j].x()-r.x());
24082408
double xw = l*dx;
24092409
if (xw > 1e-3)
24102410
{
24112411
data[k][0] += xw*(val-values_[j])/(r.x()-points_[j].x());
24122412
sxw += xw;
24132413
}
24142414

2415-
double dy = Abs(points_[j].y()-r.y());
2415+
double dy = std::fabs(points_[j].y()-r.y());
24162416
double yw = l*dy;
24172417
if (yw > 1e-3)
24182418
{
24192419
data[k][1] += yw*(val-values_[j])/(r.y()-points_[j].y());
24202420
syw += yw;
24212421
}
24222422

2423-
double dz = Abs(points_[j].z()-r.z());
2423+
double dz = std::fabs(points_[j].z()-r.z());
24242424
double zw = l*dz;
24252425
if (zw > 1e-3)
24262426
{
@@ -2502,23 +2502,23 @@ class ClosestNodeWeightedTensorGradientSource : public MappingDataSource {
25022502
{
25032503
double l = 1.0/(points_[j]-r).length();
25042504

2505-
double dx = Abs(points_[j].x()-r.x());
2505+
double dx = std::fabs(points_[j].x() - r.x());
25062506
double xw = l*dx;
25072507
if (xw > 1e-3)
25082508
{
25092509
data[0] += xw*(val-values_[j])/(r.x()-points_[j].x());
25102510
sxw += xw;
25112511
}
25122512

2513-
double dy = Abs(points_[j].y()-r.y());
2513+
double dy = std::fabs(points_[j].y() - r.y());
25142514
double yw = l*dy;
25152515
if (yw > 1e-3)
25162516
{
25172517
data[1] += yw*(val-values_[j])/(r.y()-points_[j].y());
25182518
syw += yw;
25192519
}
25202520

2521-
double dz = Abs(points_[j].z()-r.z());
2521+
double dz = std::fabs(points_[j].z() - r.z());
25222522
double zw = l*dz;
25232523
if (zw > 1e-3)
25242524
{
@@ -2572,23 +2572,23 @@ class ClosestNodeWeightedTensorGradientSource : public MappingDataSource {
25722572
{
25732573
double l = 1.0/(points_[j]-r).length();
25742574

2575-
double dx = Abs(points_[j].x()-r.x());
2575+
double dx = std::fabs(points_[j].x() - r.x());
25762576
double xw = l*dx;
25772577
if (xw > 1e-3)
25782578
{
25792579
data[k][0] += xw*(val-values_[j])/(r.x()-points_[j].x());
25802580
sxw += xw;
25812581
}
25822582

2583-
double dy = Abs(points_[j].y()-r.y());
2583+
double dy = std::fabs(points_[j].y() - r.y());
25842584
double yw = l*dy;
25852585
if (yw > 1e-3)
25862586
{
25872587
data[k][1] += yw*(val-values_[j])/(r.y()-points_[j].y());
25882588
syw += yw;
25892589
}
25902590

2591-
double dz = Abs(points_[j].z()-r.z());
2591+
double dz = std::fabs(points_[j].z() - r.z());
25922592
double zw = l*dz;
25932593
if (zw > 1e-3)
25942594
{
@@ -2663,23 +2663,23 @@ class ClosestNodeGradientNormSource : public MappingDataSource {
26632663
{
26642664
double l = 1.0/(points_[j]-r).length();
26652665

2666-
double dx = Abs(points_[j].x()-r.x());
2666+
double dx = std::fabs(points_[j].x()-r.x());
26672667
double xw = l*dx;
26682668
if (xw > 1e-3)
26692669
{
26702670
datax += xw*(val-values_[j])/(r.x()-points_[j].x());
26712671
sxw += xw;
26722672
}
26732673

2674-
double dy = Abs(points_[j].y()-r.y());
2674+
double dy = std::fabs(points_[j].y()-r.y());
26752675
double yw = l*dy;
26762676
if (yw > 1e-3)
26772677
{
26782678
datay += yw*(val-values_[j])/(r.y()-points_[j].y());
26792679
syw += yw;
26802680
}
26812681

2682-
double dz = Abs(points_[j].z()-r.z());
2682+
double dz = std::fabs(points_[j].z()-r.z());
26832683
double zw = l*dz;
26842684
if (zw > 1e-3)
26852685
{
@@ -2723,23 +2723,23 @@ class ClosestNodeGradientNormSource : public MappingDataSource {
27232723
{
27242724
double l = 1.0/(points_[j]-r).length();
27252725

2726-
double dx = Abs(points_[j].x()-r.x());
2726+
double dx = std::fabs(points_[j].x()-r.x());
27272727
double xw = l*dx;
27282728
if (xw > 1e-3)
27292729
{
27302730
datax += xw*(val-values_[j])/(r.x()-points_[j].x());
27312731
sxw += xw;
27322732
}
27332733

2734-
double dy = Abs(points_[j].y()-r.y());
2734+
double dy = std::fabs(points_[j].y()-r.y());
27352735
double yw = l*dy;
27362736
if (yw > 1e-3)
27372737
{
27382738
datay += yw*(val-values_[j])/(r.y()-points_[j].y());
27392739
syw += yw;
27402740
}
27412741

2742-
double dz = Abs(points_[j].z()-r.z());
2742+
double dz = std::fabs(points_[j].z()-r.z());
27432743
double zw = l*dz;
27442744
if (zw > 1e-3)
27452745
{
@@ -2816,23 +2816,23 @@ class ClosestNodeWeightedGradientNormSource : public MappingDataSource {
28162816
{
28172817
double l = 1.0/(points_[j]-r).length();
28182818

2819-
double dx = Abs(points_[j].x()-r.x());
2819+
double dx = std::fabs(points_[j].x()-r.x());
28202820
double xw = l*dx;
28212821
if (xw > 1e-3)
28222822
{
28232823
datax += xw*(val-values_[j])/(r.x()-points_[j].x());
28242824
sxw += xw;
28252825
}
28262826

2827-
double dy = Abs(points_[j].y()-r.y());
2827+
double dy = std::fabs(points_[j].y()-r.y());
28282828
double yw = l*dy;
28292829
if (yw > 1e-3)
28302830
{
28312831
datay += yw*(val-values_[j])/(r.y()-points_[j].y());
28322832
syw += yw;
28332833
}
28342834

2835-
double dz = Abs(points_[j].z()-r.z());
2835+
double dz = std::fabs(points_[j].z()-r.z());
28362836
double zw = l*dz;
28372837
if (zw > 1e-3)
28382838
{
@@ -2886,23 +2886,23 @@ class ClosestNodeWeightedGradientNormSource : public MappingDataSource {
28862886
{
28872887
double l = 1.0/(points_[j]-r).length();
28882888

2889-
double dx = Abs(points_[j].x()-r.x());
2889+
double dx = std::fabs(points_[j].x()-r.x());
28902890
double xw = l*dx;
28912891
if (xw > 1e-3)
28922892
{
28932893
datax += xw*(val-values_[j])/(r.x()-points_[j].x());
28942894
sxw += xw;
28952895
}
28962896

2897-
double dy = Abs(points_[j].y()-r.y());
2897+
double dy = std::fabs(points_[j].y()-r.y());
28982898
double yw = l*dy;
28992899
if (yw > 1e-3)
29002900
{
29012901
datay += yw*(val-values_[j])/(r.y()-points_[j].y());
29022902
syw += yw;
29032903
}
29042904

2905-
double dz = Abs(points_[j].z()-r.z());
2905+
double dz = std::fabs(points_[j].z()-r.z());
29062906
double zw = l*dz;
29072907
if (zw > 1e-3)
29082908
{
@@ -2985,23 +2985,23 @@ class ClosestNodeWeightedTensorGradientNormSource : public MappingDataSource {
29852985
{
29862986
double l = 1.0/(points_[j]-r).length();
29872987

2988-
double dx = Abs(points_[j].x()-r.x());
2988+
double dx = std::fabs(points_[j].x()-r.x());
29892989
double xw = l*dx;
29902990
if (xw > 1e-3)
29912991
{
29922992
datax += xw*(val-values_[j])/(r.x()-points_[j].x());
29932993
sxw += xw;
29942994
}
29952995

2996-
double dy = Abs(points_[j].y()-r.y());
2996+
double dy = std::fabs(points_[j].y()-r.y());
29972997
double yw = l*dy;
29982998
if (yw > 1e-3)
29992999
{
30003000
datay += yw*(val-values_[j])/(r.y()-points_[j].y());
30013001
syw += yw;
30023002
}
30033003

3004-
double dz = Abs(points_[j].z()-r.z());
3004+
double dz = std::fabs(points_[j].z()-r.z());
30053005
double zw = l*dz;
30063006
if (zw > 1e-3)
30073007
{
@@ -3055,23 +3055,23 @@ class ClosestNodeWeightedTensorGradientNormSource : public MappingDataSource {
30553055
{
30563056
double l = 1.0/(points_[j]-r).length();
30573057

3058-
double dx = Abs(points_[j].x()-r.x());
3058+
double dx = std::fabs(points_[j].x()-r.x());
30593059
double xw = l*dx;
30603060
if (xw > 1e-3)
30613061
{
30623062
datax += xw*(val-values_[j])/(r.x()-points_[j].x());
30633063
sxw += xw;
30643064
}
30653065

3066-
double dy = Abs(points_[j].y()-r.y());
3066+
double dy = std::fabs(points_[j].y()-r.y());
30673067
double yw = l*dy;
30683068
if (yw > 1e-3)
30693069
{
30703070
datay += yw*(val-values_[j])/(r.y()-points_[j].y());
30713071
syw += yw;
30723072
}
30733073

3074-
double dz = Abs(points_[j].z()-r.z());
3074+
double dz = std::fabs(points_[j].z()-r.z());
30753075
double zw = l*dz;
30763076
if (zw > 1e-3)
30773077
{

‎src/Core/Algorithms/Legacy/Forward/BuildBEMatrixAlgo.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -452,13 +452,13 @@ double BuildBEMatrixBase::get_new_auto_g(
452452
{
453453
gama_j = gama_j + gama;
454454
rhoj = h / cos(alfa - gama_j);
455-
sum = sum + sqrt( Abs(rhoj * rhoj_1) );
455+
sum = sum + sqrt( std::fabs(rhoj * rhoj_1) );
456456
rhoj_1 = rhoj;
457457
}
458-
sai_new = sum * sqrt( Abs(gama * sin(gama)) );
458+
sai_new = sum * sqrt(std::fabs(gama * sin(gama)));
459459
delta = 0;
460460
if (sai_new + sai_old)
461-
delta = Abs( (sai_new - sai_old) / (sai_new + sai_old) );
461+
delta = std::fabs((sai_new - sai_old) / (sai_new + sai_old));
462462
sai_old = sai_new;
463463
}
464464
return sai_new;

‎src/Core/Algorithms/Math/BuildNoiseColumnMatrix.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ MatrixHandle BuildNoiseColumnMatrixAlgorithm::run(MatrixHandle input_matrix) con
7070
}
7171
power /= nc*nr;
7272

73-
sigma = sqrt(power)/(snr*Sqrt(2*M_PI));
73+
sigma = sqrt(power)/(snr*sqrt(2*M_PI));
7474

7575
for(r = 0; r < nr; r++)
7676
{

‎src/Core/Datatypes/ColorMap.cc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
*/
2828
/// @todo Documentation Core/Datatypes/ColorMap.cc
2929

30+
#include <Core/Math/MiscMath.h>
3031
#include <Core/Datatypes/ColorMap.h>
3132

3233
using namespace SCIRun::Core::Datatypes;

‎src/Core/Datatypes/Legacy/Field/TetVolMesh.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4207,11 +4207,11 @@ TetVolMesh<Basis>::insert_node_in_elem(typename Elem::array_type &tets,
42074207
const Core::Geometry::Point &p3 = points_[cells_[ci*4 + 3]];
42084208

42094209
// Compute all the new tet areas.
4210-
const double aerr = Abs(Dot(Cross(p1 - p0, p2 - p0), p3 - p0)) * 0.01;
4211-
const double a0 = Abs(Dot(Cross(p1 - p, p2 - p), p3 - p));
4212-
const double a1 = Abs(Dot(Cross(p - p0, p2 - p0), p3 - p0));
4213-
const double a2 = Abs(Dot(Cross(p1 - p0, p - p0), p3 - p0));
4214-
const double a3 = Abs(Dot(Cross(p1 - p0, p2 - p0), p - p0));
4210+
const double aerr = std::fabs(Dot(Cross(p1 - p0, p2 - p0), p3 - p0)) * 0.01;
4211+
const double a0 = std::fabs(Dot(Cross(p1 - p, p2 - p), p3 - p));
4212+
const double a1 = std::fabs(Dot(Cross(p - p0, p2 - p0), p3 - p0));
4213+
const double a2 = std::fabs(Dot(Cross(p1 - p0, p - p0), p3 - p0));
4214+
const double a3 = std::fabs(Dot(Cross(p1 - p0, p2 - p0), p - p0));
42154215

42164216
mask_type mask = 0;
42174217
if (a0 >= aerr && a0 >= epsilon3_) { mask |= 1; }

‎src/Core/GeometryPrimitives/Tensor.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ double Tensor::norm()
246246
for (int i=0;i<3;i++)
247247
{
248248
sum = 0.0;
249-
for (int j=0;j<3;j++) sum += SCIRun::Abs(mat_[i][j]);
249+
for (int j=0;j<3;j++) sum += std::fabs(mat_[i][j]);
250250
if (sum > a) a = sum;
251251
}
252252
return (a);

0 commit comments

Comments
 (0)