casa / casa5 / c670a85fd7f

Commits

Takeshi Nakazato authored c670a85fd7f Merge 08 Apr 2018

Merge pull request #450 in CASA/casa from feature/CAS-10787 to master

* commit 'd4c3f65ff2b50b49c0b4bf10e2edb71b43eb10fe':
  add test for cubic interpolation
  update test_apply_sky06
  add a comment
  update unit test test_apply_sky06 since interp='cubic' is now available
  modified so that CTTimeInterp::interpolate() can interpolate data with cubic line.

code/synthesis/CalTables/test/tCTTimeInterp1.cc

Modified

-96
-97
+    if (verbose) cout << "Testing 'nearest' (tol="<<tol<<")..." << endl;
-98
+    for (uInt itime=0;itime<timelist.nelements();++itime) {
-99
+      // Call time interpolation
-100
+      sci.interpolate(timelist(itime));
-101
+      Complex cfval=NewCalTable::NCTtestvalueC(0,0,0,ntimelist(itime),refTime,tint);
-102
+      RIorAPArray f(result);
-103
+      //    Matrix<Complex> c(f.c());
-104
+      Complex rc=Matrix<Complex>(f.c())(0,0);
-105
+      Float diff=abs(rc-cfval);
--
+      if (verbose)
-+
+      //if (verbose)
-107
+	cout << "t="<<timelist(itime)<<" (dt="<<(timelist(itime)-refTime)/tint<<")"
-108
+	     << " result = " << rc << " cf=" << cfval << "  diff="<< diff << " near=" << boolalpha << nearAbs(diff,0.0f,tol) << endl;
-109
+      AlwaysAssert(nearAbs(diff,0.0f,tol),AipsError);
-110
+    }
-111
+  }
-112
-113
+  // Reset to linear
-114
+  itype="linear";
-115
+  sci.setInterpType(itype);
-116
-133
+    timelist(5)=refTime+1.e5*tint; ntimelist(5)=refTime+(nTime-1)*tint;  // a way late point
-134
-135
+    if (verbose) cout << "Testing 'linear' (tol="<<tol<<")..." << endl;
-136
+    for (uInt itime=0;itime<timelist.nelements();++itime) {
-137
+      // Call time interpolation
-138
+      sci.interpolate(timelist(itime));
-139
+      Complex cfval=NewCalTable::NCTtestvalueC(0,0,0,ntimelist(itime),refTime,tint);
-140
+      RIorAPArray f(result);
-141
+      Complex rc=Matrix<Complex>(f.c())(0,0);
-142
+      Float diff=abs(rc-cfval);
--
+      if (verbose)
-+
+      //if (verbose)
-+
+	cout << "t="<<timelist(itime)<<" (dt="<<(timelist(itime)-refTime)/tint<<")"
-+
+	     << " result = " << rc << " cf=" << cfval << "  diff="<<diff<< " near=" << boolalpha << nearAbs(diff,0.0f,tol) << endl;
-+
+      AlwaysAssert(nearAbs(diff,0.0f,tol),AipsError);
-+
+    }
-+
+  }
-+
-+
+  // Reset to cubic
-+
+  itype="cubic";
-+
+  sci.setInterpType(itype);
-+
-+
+  if (verbose)
-+
+    sci.state();
-+
-+
+  if (verbose) cout << "sci.timeType() = " << sci.timeType() << endl;
-+
+  AlwaysAssert( (sci.timeType()==itype), AipsError);
-+
-+
-+
-+
+  {
-+
+    // Testing cubic in various ways
-+
+    Vector<Double> timelist(6), ntimelist(6);
-+
+    timelist(0)=refTime-1.e5*tint; ntimelist(0)=refTime;   // a way early point
-+
+    timelist(1)=refTime+tint;      ntimelist(1)=timelist(1);  // an exact point
-+
+    timelist(2)=refTime+2.2*tint;  ntimelist(2)=timelist(2);  // nearest to left
-+
+    timelist(3)=refTime+2.9*tint;  ntimelist(3)=timelist(3);  // nearest to right (same interval)
-+
+    timelist(4)=refTime+3.1*tint;  ntimelist(4)=timelist(4);  // new time, new interval
-+
+    timelist(5)=refTime+1.e5*tint; ntimelist(5)=refTime+(nTime-1)*tint;  // a way late point
-+
-+
+    if (verbose) cout << "Testing 'cubic' (tol="<<tol<<")..." << endl;
-+
+    for (uInt itime=0;itime<timelist.nelements();++itime) {
-+
+      // Call time interpolation
-+
+      sci.interpolate(timelist(itime));
-+
+      Complex cfval=NewCalTable::NCTtestvalueC(0,0,0,ntimelist(itime),refTime,tint);
-+
+      RIorAPArray f(result);
-+
+      Complex rc=Matrix<Complex>(f.c())(0,0);
-+
+      Float diff=abs(rc-cfval);
-+
+      //if (verbose)
-181
+	cout << "t="<<timelist(itime)<<" (dt="<<(timelist(itime)-refTime)/tint<<")"
-182
+	     << " result = " << rc << " cf=" << cfval << "  diff="<<diff<< " near=" << boolalpha << nearAbs(diff,0.0f,tol) << endl;
-183
+      AlwaysAssert(nearAbs(diff,0.0f,tol),AipsError);
-184
+    }
-185
+  }
-186
-187
+  }
-188
-189
-190
+}

casa5

Commits

Jira Issues

Add shortcut