DM-12006: Improve testing of copyPolymorphic

.gitignore

@@ -5,6 +5,7 @@ config.log
 .sconf_temp
 .cache
 .pytest_cache
+.coverage
 *.o
 *.os
 *.so

include/astshim/Channel.h

@@ -156,7 +156,7 @@ class Channel : public Object {
     int write(Object const &object);
 
 protected:
-    virtual std::shared_ptr<Object> copyPolymorphic() const override { return std::shared_ptr<Object>(); }
+    std::shared_ptr<Object> copyPolymorphic() const override { return std::shared_ptr<Object>(); }
 
     /**
     Construct a channel from an AST channel pointer and a @ref Stream

include/astshim/ChebyMap.h

@@ -304,7 +304,7 @@ class ChebyMap : public Mapping {
     ChebyMap polyTran(bool forward, double acc, double maxacc, int maxorder) const;
 
 protected:
-    virtual std::shared_ptr<Object> copyPolymorphic() const override {
+    std::shared_ptr<Object> copyPolymorphic() const override {
         return copyImpl<ChebyMap, AstChebyMap>();
     }
 

include/astshim/CmpFrame.h

@@ -96,7 +96,7 @@ class CmpFrame : public Frame {
     std::shared_ptr<Frame> operator[](int i) const { return decompose<Frame>(i, false); }
 
 protected:
-    virtual std::shared_ptr<Object> copyPolymorphic() const override {
+    std::shared_ptr<Object> copyPolymorphic() const override {
         return copyImpl<CmpFrame, AstCmpFrame>();
     }
 

include/astshim/CmpMap.h

@@ -102,7 +102,7 @@ class CmpMap : public Mapping {
     bool getSeries() { return detail::isSeries(reinterpret_cast<AstCmpMap *>(getRawPtr())); }
 
 protected:
-    virtual std::shared_ptr<Object> copyPolymorphic() const override {
+    std::shared_ptr<Object> copyPolymorphic() const override {
         return copyImpl<CmpMap, AstCmpMap>();
     }
 

include/astshim/Frame.h

@@ -1523,7 +1523,7 @@ class Frame : public Mapping {
         }
     }
 
-    virtual std::shared_ptr<Object> copyPolymorphic() const override { return copyImpl<Frame, AstFrame>(); }
+    std::shared_ptr<Object> copyPolymorphic() const override { return copyImpl<Frame, AstFrame>(); }
 
 private:
     /**

include/astshim/FrameDict.h

@@ -254,7 +254,7 @@ class FrameDict : public FrameSet {
     void setDomain(std::string const &domain) override;
 
 protected:
-    virtual std::shared_ptr<Object> copyPolymorphic() const override {
+    std::shared_ptr<Object> copyPolymorphic() const override {
         return copyImpl<FrameDict, AstFrameSet>();
     }
 

include/astshim/FrameSet.h

@@ -475,7 +475,7 @@ class FrameSet : public Frame {
     void setCurrent(int ind) { setI("Current", ind); }
 
 protected:
-    virtual std::shared_ptr<Object> copyPolymorphic() const override {
+    std::shared_ptr<Object> copyPolymorphic() const override {
         return copyImpl<FrameSet, AstFrameSet>();
     }
 

include/astshim/KeyMap.h

@@ -579,7 +579,7 @@ class KeyMap : public Object {
 
 protected:
     // Protected implementation of deep-copy.
-    virtual std::shared_ptr<Object> copyPolymorphic() const override {
+    std::shared_ptr<Object> copyPolymorphic() const override {
         return std::static_pointer_cast<KeyMap>(copyImpl<KeyMap, AstKeyMap>());
     }
 

include/astshim/LutMap.h

@@ -98,7 +98,7 @@ class LutMap : public Mapping {
     int getLutInterp() const { return getI("LutInterp"); }
 
 protected:
-    virtual std::shared_ptr<Object> copyPolymorphic() const override {
+    std::shared_ptr<Object> copyPolymorphic() const override {
         return copyImpl<LutMap, AstLutMap>();
     }
 

include/astshim/Mapping.h

@@ -68,9 +68,6 @@ class Mapping : public Object {
     Mapping &operator=(Mapping const &) = delete;
     Mapping &operator=(Mapping &&) = default;
 
-    /// Return a deep copy of this object.
-    std::shared_ptr<Mapping> copy() const { return std::static_pointer_cast<Mapping>(copyPolymorphic()); }
-
     /**
     Get @ref Mapping_NIn "NIn": the number of input axes
     */
@@ -406,11 +403,6 @@ class Mapping : public Object {
         }
     }
 
-    // Protected implementation of deep-copy.
-    virtual std::shared_ptr<Object> copyPolymorphic() const override {
-        return std::static_pointer_cast<Mapping>(copyImpl<Mapping, AstMapping>());
-    }
-
     /**
     Return a deep copy of one of the two component mappings.
 

include/astshim/MathMap.h

@@ -405,7 +405,7 @@ class MathMap : public Mapping {
     bool getSimpIF() const { return getB("SimpIF"); }
 
 protected:
-    virtual std::shared_ptr<Object> copyPolymorphic() const override {
+    std::shared_ptr<Object> copyPolymorphic() const override {
         return copyImpl<MathMap, AstMathMap>();
     }
 

include/astshim/MatrixMap.h

@@ -85,7 +85,7 @@ class MatrixMap : public Mapping {
     std::shared_ptr<MatrixMap> copy() const { return std::static_pointer_cast<MatrixMap>(copyPolymorphic()); }
 
 protected:
-    virtual std::shared_ptr<Object> copyPolymorphic() const override {
+    std::shared_ptr<Object> copyPolymorphic() const override {
         return copyImpl<MatrixMap, AstMatrixMap>();
     }
 

include/astshim/NormMap.h

@@ -74,7 +74,7 @@ class NormMap : public Mapping {
     std::shared_ptr<NormMap> copy() const { return std::static_pointer_cast<NormMap>(copyPolymorphic()); }
 
 protected:
-    virtual std::shared_ptr<Object> copyPolymorphic() const override {
+    std::shared_ptr<Object> copyPolymorphic() const override {
         return copyImpl<NormMap, AstNormMap>();
     }
 

include/astshim/ParallelMap.h

@@ -83,7 +83,7 @@ class ParallelMap : public CmpMap {
     }
 
 protected:
-    virtual std::shared_ptr<Object> copyPolymorphic() const override {
+    std::shared_ptr<Object> copyPolymorphic() const override {
         return copyImpl<ParallelMap, AstCmpMap>();
     }
 

include/astshim/PcdMap.h

@@ -114,7 +114,7 @@ class PcdMap : public Mapping {
     }
 
 protected:
-    virtual std::shared_ptr<Object> copyPolymorphic() const override {
+    std::shared_ptr<Object> copyPolymorphic() const override {
         return copyImpl<PcdMap, AstPcdMap>();
     }
 

include/astshim/PermMap.h

@@ -90,7 +90,7 @@ class PermMap : public Mapping {
     std::shared_ptr<PermMap> copy() const { return std::static_pointer_cast<PermMap>(copyPolymorphic()); }
 
 protected:
-    virtual std::shared_ptr<Object> copyPolymorphic() const override {
+    std::shared_ptr<Object> copyPolymorphic() const override {
         return copyImpl<PermMap, AstPermMap>();
     }
 

include/astshim/PolyMap.h

@@ -233,7 +233,7 @@ class PolyMap : public Mapping {
                      std::vector<double> const &ubnd) const;
 
 protected:
-    virtual std::shared_ptr<Object> copyPolymorphic() const override {
+    std::shared_ptr<Object> copyPolymorphic() const override {
         return copyImpl<PolyMap, AstPolyMap>();
     }
 

include/astshim/RateMap.h

@@ -84,7 +84,7 @@ class RateMap : public Mapping {
     std::shared_ptr<RateMap> copy() const { return std::static_pointer_cast<RateMap>(copyPolymorphic()); }
 
 protected:
-    virtual std::shared_ptr<Object> copyPolymorphic() const override {
+    std::shared_ptr<Object> copyPolymorphic() const override {
         return copyImpl<RateMap, AstRateMap>();
     }
 

include/astshim/SeriesMap.h

@@ -83,7 +83,7 @@ class SeriesMap : public CmpMap {
     }
 
 protected:
-    virtual std::shared_ptr<Object> copyPolymorphic() const override {
+    std::shared_ptr<Object> copyPolymorphic() const override {
         return copyImpl<SeriesMap, AstCmpMap>();
     }
 

include/astshim/ShiftMap.h

@@ -62,7 +62,7 @@ class ShiftMap : public Mapping {
     std::shared_ptr<ShiftMap> copy() const { return std::static_pointer_cast<ShiftMap>(copyPolymorphic()); }
 
 protected:
-    virtual std::shared_ptr<Object> copyPolymorphic() const override {
+    std::shared_ptr<Object> copyPolymorphic() const override {
         return copyImpl<ShiftMap, AstShiftMap>();
     }
 

include/astshim/SkyFrame.h

@@ -239,7 +239,7 @@ class SkyFrame : public Frame {
     }
 
 protected:
-    virtual std::shared_ptr<Object> copyPolymorphic() const override {
+    std::shared_ptr<Object> copyPolymorphic() const override {
         return copyImpl<SkyFrame, AstSkyFrame>();
     }
 

include/astshim/SlaMap.h

@@ -178,7 +178,7 @@ class SlaMap : public Mapping {
     }
 
 protected:
-    virtual std::shared_ptr<Object> copyPolymorphic() const override {
+    std::shared_ptr<Object> copyPolymorphic() const override {
         return copyImpl<SlaMap, AstSlaMap>();
     }
 

include/astshim/SpecFrame.h

@@ -271,7 +271,7 @@ class SpecFrame : public Frame {
     void setStdOfRest(std::string const &stdOfRest) { setC("StdOfRest", stdOfRest); }
 
 protected:
-    virtual std::shared_ptr<Object> copyPolymorphic() const override {
+    std::shared_ptr<Object> copyPolymorphic() const override {
         return copyImpl<SpecFrame, AstSpecFrame>();
     }
 

include/astshim/SphMap.h

@@ -81,7 +81,7 @@ class SphMap : public Mapping {
     double getPolarLong() const { return getD("PolarLong"); }
 
 protected:
-    virtual std::shared_ptr<Object> copyPolymorphic() const override {
+    std::shared_ptr<Object> copyPolymorphic() const override {
         return copyImpl<SphMap, AstSphMap>();
     }
 

include/astshim/TimeFrame.h

@@ -145,7 +145,7 @@ class TimeFrame : public Frame {
     void setTimeScale(std::string const &scale) { return setC("TimeScale", scale); }
 
 protected:
-    virtual std::shared_ptr<Object> copyPolymorphic() const override {
+    std::shared_ptr<Object> copyPolymorphic() const override {
         return copyImpl<TimeFrame, AstTimeFrame>();
     }
 

include/astshim/TimeMap.h

@@ -184,7 +184,7 @@ class TimeMap : public Mapping {
     }
 
 protected:
-    virtual std::shared_ptr<Object> copyPolymorphic() const override {
+    std::shared_ptr<Object> copyPolymorphic() const override {
         return copyImpl<TimeMap, AstTimeMap>();
     }
 

include/astshim/TranMap.h

@@ -82,7 +82,7 @@ class TranMap : public Mapping {
     std::shared_ptr<TranMap> copy() const { return std::static_pointer_cast<TranMap>(copyPolymorphic()); }
 
 protected:
-    virtual std::shared_ptr<Object> copyPolymorphic() const override {
+    std::shared_ptr<Object> copyPolymorphic() const override {
         return copyImpl<TranMap, AstTranMap>();
     }
 

include/astshim/UnitMap.h

@@ -66,7 +66,7 @@ class UnitMap : public Mapping {
     std::shared_ptr<UnitMap> copy() const { return std::static_pointer_cast<UnitMap>(copyPolymorphic()); }
 
 protected:
-    virtual std::shared_ptr<Object> copyPolymorphic() const override {
+    std::shared_ptr<Object> copyPolymorphic() const override {
         return copyImpl<UnitMap, AstUnitMap>();
     }
 

include/astshim/UnitNormMap.h

@@ -81,7 +81,7 @@ class UnitNormMap : public Mapping {
     }
 
 protected:
-    virtual std::shared_ptr<Object> copyPolymorphic() const override {
+    std::shared_ptr<Object> copyPolymorphic() const override {
         return copyImpl<UnitNormMap, AstUnitNormMap>();
     }
 

include/astshim/WcsMap.h

@@ -254,7 +254,7 @@ class WcsMap : public Mapping {
     WcsType getWcsType() const { return static_cast<WcsType>(getI("WcsType")); }
 
 protected:
-    virtual std::shared_ptr<Object> copyPolymorphic() const override {
+    std::shared_ptr<Object> copyPolymorphic() const override {
         return copyImpl<WcsMap, AstWcsMap>();
     }
 

include/astshim/WinMap.h

@@ -75,7 +75,7 @@ class WinMap : public Mapping {
     std::shared_ptr<WinMap> copy() const { return std::static_pointer_cast<WinMap>(copyPolymorphic()); }
 
 protected:
-    virtual std::shared_ptr<Object> copyPolymorphic() const override {
+    std::shared_ptr<Object> copyPolymorphic() const override {
         return copyImpl<WinMap, AstWinMap>();
     }
 

include/astshim/ZoomMap.h

@@ -76,7 +76,7 @@ class ZoomMap : public Mapping {
     double getZoom() const { return getF("Zoom"); }
 
 protected:
-    virtual std::shared_ptr<Object> copyPolymorphic() const override {
+    std::shared_ptr<Object> copyPolymorphic() const override {
         return copyImpl<ZoomMap, AstZoomMap>();
     }
 

src/functional.cc

@@ -56,7 +56,7 @@ std::shared_ptr<Mapping> makeRadialMapping(std::vector<double> const& center, Ma
                                     " outputs, instead of 1");
     }
     auto unitNormMap = UnitNormMap(center);
-    return std::make_shared<Mapping>(
+    return std::make_shared<SeriesMap>(
             unitNormMap.then(UnitMap(naxes).under(mapping1d)).then(*unitNormMap.getInverse()));
 }