On Wed, 2010-10-06 at 19:55 +0200, Julien Cristau wrote:
> On Wed, Oct 6, 2010 at 17:12:54 +0200, Soeren Sonnenburg wrote:
>
> > jblas 1.0.2 is currently in squeeze, is not working whenever complex
> > numbers are returned as results. So upstream fixed that in version 1.1-1
> > and filed an important bug.
> >
> > I fixed that in jblas 1.1-1 and the package got unblocked. In the
> > meantime upstream made another bugfix release - version 1.1.1 which I
> > uploaded to unstable under version 1.1.1-1.
> >
> It would have been nice to let the unblocked version transition first...
>
> > Now atlas transitioned into testing but jblas does not because of this
> > recent upload (waiting 20 days without bugreports).
> >
> > Since this package has no rdepends and is new in squeeze it should be
> > pretty safe to upgrade even to this new version.
> >
> > Could you please unblock it?
> >
> > unblock jblas/1.1.1-1
> >
> +
> + /** Get matrix element, passing the variable to store the result. */
> + public ComplexDouble get(int rowIndex, int columnIndex, ComplexDouble result) {
> + return get(index(rowIndex, columnIndex));
> + }
>
> Am I missing something, or is that not using result at all?
I finally got an answer and small patch (attached) from upstream Re this
issue. Shall I prepare jblas 1.1.1-2 that includes this patch?
> Cheers,
> Julien
Soeren
--
For the one fact about the future of which we can be certain is that it
will be utterly fantastic. -- Arthur C. Clarke, 1962
diff --git a/src/org/jblas/ComplexDoubleMatrix.java b/src/org/jblas/ComplexDoubleMatrix.java
index 433e2d8..1f8b345 100644
--- a/src/org/jblas/ComplexDoubleMatrix.java
+++ b/src/org/jblas/ComplexDoubleMatrix.java
@@ -768,7 +768,7 @@ public class ComplexDoubleMatrix {
/** Get matrix element, passing the variable to store the result. */
public ComplexDouble get(int rowIndex, int columnIndex, ComplexDouble result) {
- return get(index(rowIndex, columnIndex));
+ return get(index(rowIndex, columnIndex), result);
}
public DoubleMatrix getReal() {
diff --git a/src/org/jblas/ComplexFloatMatrix.java b/src/org/jblas/ComplexFloatMatrix.java
index 271a2b7..2b11fed 100644
--- a/src/org/jblas/ComplexFloatMatrix.java
+++ b/src/org/jblas/ComplexFloatMatrix.java
@@ -768,7 +768,7 @@ public class ComplexFloatMatrix {
/** Get matrix element, passing the variable to store the result. */
public ComplexFloat get(int rowIndex, int columnIndex, ComplexFloat result) {
- return get(index(rowIndex, columnIndex));
+ return get(index(rowIndex, columnIndex), result);
}
public FloatMatrix getReal() {
diff --git a/src/org/jblas/DoubleMatrix.java b/src/org/jblas/DoubleMatrix.java
index b1bf24a..0109047 100644
--- a/src/org/jblas/DoubleMatrix.java
+++ b/src/org/jblas/DoubleMatrix.java
@@ -91,8 +91,8 @@ import java.util.List;
* <tr><th>Method<th>Description
* <tr><td>DoubleMatrix(m)<td>Constructs a column vector.
* <tr><td>DoubleMatrix(new double[] {value1, value2, ...})<td>Constructs a column vector.
- * <tr><td>DoubleMatrix.zeros(m) <td>Initial values set to 1.0.
- * <tr><td>DoubleMatrix.ones(m) <td>Initial values set to 0.0.
+ * <tr><td>DoubleMatrix.zeros(m) <td>Initial values set to 0.0.
+ * <tr><td>DoubleMatrix.ones(m) <td>Initial values set to 1.0.
* <tr><td>DoubleMatrix.rand(m) <td>Values drawn at random between 0.0 and 1.0.
* <tr><td>DoubleMatrix.randn(m) <td>Values drawn from normal distribution.
* </table>
@@ -835,6 +835,7 @@ public class DoubleMatrix implements Serializable {
}
}
+
/** Set elements in linear ordering in the specified indices. */
public DoubleMatrix put(int[] indices, DoubleMatrix x) {
if (x.isScalar()) {
diff --git a/src/org/jblas/FloatMatrix.java b/src/org/jblas/FloatMatrix.java
index 0e381a1..1251a39 100644
--- a/src/org/jblas/FloatMatrix.java
+++ b/src/org/jblas/FloatMatrix.java
@@ -91,8 +91,8 @@ import java.util.List;
* <tr><th>Method<th>Description
* <tr><td>FloatMatrix(m)<td>Constructs a column vector.
* <tr><td>FloatMatrix(new float[] {value1, value2, ...})<td>Constructs a column vector.
- * <tr><td>FloatMatrix.zeros(m) <td>Initial values set to 1.0f.
- * <tr><td>FloatMatrix.ones(m) <td>Initial values set to 0.0f.
+ * <tr><td>FloatMatrix.zeros(m) <td>Initial values set to 0.0f.
+ * <tr><td>FloatMatrix.ones(m) <td>Initial values set to 1.0f.
* <tr><td>FloatMatrix.rand(m) <td>Values drawn at random between 0.0f and 1.0f.
* <tr><td>FloatMatrix.randn(m) <td>Values drawn from normal distribution.
* </table>
@@ -835,6 +835,7 @@ public class FloatMatrix implements Serializable {
}
}
+
/** Set elements in linear ordering in the specified indices. */
public FloatMatrix put(int[] indices, FloatMatrix x) {
if (x.isScalar()) {
Attachment:
signature.asc
Description: This is a digitally signed message part