Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

u/jbosch/DM-1188 #1

Merged
merged 12 commits into from
Sep 23, 2014
Merged

u/jbosch/DM-1188 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e547711
Switch from std::list to std::vector in MultiShapeletFunction.
TallJimbo May 11, 2014
5443966
Add # of components getter to MultiShapeletBasis
TallJimbo Sep 11, 2014
72d7419
Add method to compute convolution orders in advance.
TallJimbo Sep 13, 2014
ffb98db
Add vectorized evaluation to [Multi]ShapeletFunction
TallJimbo Sep 15, 2014
c72c8db
Make it possible to pass ellipses to testing utility functions
TallJimbo Sep 16, 2014
8c99a21
Add MatrixBuilder, a unified interface for shapelet matrix evaluation
TallJimbo Sep 11, 2014
13feffe
Remove old MultiShapeletMatrixBuilder
TallJimbo Sep 17, 2014
6d5f02e
Remove old ModelBuilder
TallJimbo Sep 17, 2014
b4ea101
Rename MultiShapeletFunction's "elements" to "components"
TallJimbo Sep 18, 2014
782a38a
Doc fixes and improvements from review of DM-1188.
TallJimbo Sep 23, 2014
29983d9
Rename apply() methods in MatrixBuilder implementation classes
TallJimbo Sep 23, 2014
cf2f186
Adjust test tolerances to account for differences in random number ge…
TallJimbo Sep 23, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 9 additions & 12 deletions examples/timeModels.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
template <typename T>
double buildModelsImpl(
int nPixels, int basisSize,
lsst::shapelet::MultiShapeletMatrixBuilder<T> const & builder,
lsst::shapelet::MatrixBuilder<T> const & builder,
ndarray::Array<double const,2> const & parameters,
std::string const & ellipseType
) {
Expand All @@ -69,7 +69,7 @@ double buildModelsImpl(
double result = 0.0;
for (ndarray::Array<double const,2>::Iterator i = parameters.begin(); i != parameters.end(); ++i) {
ellipse.setParameterVector(i->asEigen());
builder.build(matrix, ellipse);
builder(matrix, ellipse);
result += matrix.asEigen().norm();
}
return result;
Expand All @@ -79,18 +79,18 @@ double buildModelsImpl(

%inline %{

double buildModelsF(
void buildModelsF(
int nPixels, int basisSize,
lsst::shapelet::MultiShapeletMatrixBuilder<float> const & builder,
lsst::shapelet::MatrixBuilder<float> const & builder,
ndarray::Array<double const,2> const & parameters,
std::string const & ellipseType
) {
buildModelsImpl(nPixels, basisSize, builder, parameters, ellipseType);
}

double buildModelsD(
void buildModelsD(
int nPixels, int basisSize,
lsst::shapelet::MultiShapeletMatrixBuilder<double> const & builder,
lsst::shapelet::MatrixBuilder<double> const & builder,
ndarray::Array<double const,2> const & parameters,
std::string const & ellipseType
) {
Expand Down Expand Up @@ -122,8 +122,6 @@ def main():
default=8, type=int)
parser.add_argument("--n-bulge-terms", help="Number of Gaussians in bulge (de Vaucouleur) component",
default=8, type=int)
parser.add_argument("--approximate-exp", help="Use the approximate fast exponential from lsst::utils",
default=False, action="store_true")
parser.add_argument("--n-x-pixels", help="Number of pixels in x direction (footprint is a rectangle)",
default=20, type=int)
parser.add_argument("--n-y-pixels", help="Number of pixels in y direction (footprint is a rectangle)",
Expand All @@ -141,17 +139,16 @@ def main():
yMin = -args.n_y_pixels // 2
if args.double_precision:
dtype = numpy.float64
Builder = lsst.shapelet.MultiShapeletMatrixBuilderD
Builder = lsst.shapelet.MatrixBuilderD
func = buildModelsD
else:
dtype = numpy.float32
Builder = lsst.shapelet.MultiShapeletMatrixBuilderF
Builder = lsst.shapelet.MatrixBuilderF
func = buildModelsF

x, y = numpy.meshgrid(numpy.arange(xMin, xMin+args.n_x_pixels, dtype=dtype),
numpy.arange(yMin, yMin+args.n_y_pixels, dtype=dtype))
builder = Builder(disk, psf, x.flatten(), y.flatten(),
args.approximate_exp)
builder = Builder(x.flatten(), y.flatten(), disk, psf)
parameters = numpy.random.randn(args.n_samples, 5)
cpuTime1 = time.clock()
res1 = resource.getrusage(resource.RUSAGE_SELF)
Expand Down
2 changes: 1 addition & 1 deletion include/lsst/shapelet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
#include "lsst/shapelet/ShapeletFunction.h"
#include "lsst/shapelet/MultiShapeletFunction.h"
#include "lsst/shapelet/BasisEvaluator.h"
#include "lsst/shapelet/ModelBuilder.h"
#include "lsst/shapelet/HermiteTransformMatrix.h"
#include "lsst/shapelet/GaussHermiteConvolution.h"
#include "lsst/shapelet/GaussHermiteProjection.h"
#include "lsst/shapelet/MultiShapeletBasis.h"
#include "lsst/shapelet/MatrixBuilder.h"

#endif // !defined(LSST_AFW_MATH_SHAPELETS_H)
2 changes: 2 additions & 0 deletions include/lsst/shapelet/GaussHermiteConvolution.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ class ShapeletFunction;
class GaussHermiteConvolution : private boost::noncopyable {
public:

static int computeRowOrder(int colOrder, int psfOrder) { return colOrder + psfOrder; }

/**
* @brief Evaluate a shapelet convolution matrix in the given array.
*
Expand Down