|
45 | 45 | * {@code d' = f(x - x0) + y0}, must have exactly one intersection point (for |
46 | 46 | * each dimension): |
47 | 47 | * </p> |
48 | | - * |
| 48 | + * |
49 | 49 | * <pre> |
50 | 50 | * |{ x : f(x) = f(x -x0) + y0 }| = 1 |
51 | 51 | * </pre> |
|
55 | 55 | * <p> |
56 | 56 | * {@code D( p ) = min_q f(q) + d(p,q)} where p,q are points on a grid/image. |
57 | 57 | * </p> |
58 | | - * |
| 58 | + * |
59 | 59 | * @author Philipp Hanslovsky |
60 | 60 | * |
61 | 61 | */ |
62 | 62 | public interface Distance |
63 | 63 | { |
64 | 64 |
|
65 | 65 | /** |
66 | | - * Evaluate function with family parameters xShift and yShift at position x |
67 | | - * in dimension dim. |
| 66 | + * Evaluate function with family parameters {@code xShift} and |
| 67 | + * {@code yShift} at position {@code x} in dimension dim. |
| 68 | + * |
| 69 | + * @param x |
| 70 | + * position on x-axis at which function is evaluated |
| 71 | + * @param xShift |
| 72 | + * shift along the x-axis |
| 73 | + * @param yShift |
| 74 | + * shift along y-axis |
| 75 | + * @param dim |
| 76 | + * dimension in which to evaluate |
| 77 | + * @return Function value at position {@code x} |
68 | 78 | */ |
69 | 79 | double evaluate( double x, double xShift, double yShift, int dim ); |
70 | 80 |
|
71 | 81 | /** |
72 | 82 | * |
73 | 83 | * Determine the intersection point in dimension dim of two members of the |
74 | | - * function family. The members are parameterized by xShift1, yShift1, |
75 | | - * xShift2, yShift2, with xShift1 < xShift2. |
| 84 | + * function family. The members are parameterized by {@code xShift1}, |
| 85 | + * {@code yShift1}, {@code xShift2}, {@code yShift2}, with {@code xShift1 > |
| 86 | + * xShift2}. |
| 87 | + * |
| 88 | + * @param xShift1 |
| 89 | + * shift along the x-axis |
| 90 | + * @param yShift1 |
| 91 | + * shift along the y-axis |
| 92 | + * @param xShift2 |
| 93 | + * shift along the x-axis |
| 94 | + * @param yShift2 |
| 95 | + * shift along the y-axis |
| 96 | + * @param dim |
| 97 | + * dimension in which to evaluate |
| 98 | + * @return intersection point along axis defined by {@code dim} |
76 | 99 | */ |
77 | 100 | double intersect( double xShift1, double yShift1, double xShift2, double yShift2, int dim ); |
78 | 101 |
|
|
0 commit comments