Return-Path: 
 <commits-return-4195-apmail-poi-commits-archive=poi.apache.org@poi.apache.org>
X-Original-To: apmail-poi-commits-archive@minotaur.apache.org
Delivered-To: apmail-poi-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 56906108AA
	for <apmail-poi-commits-archive@minotaur.apache.org>;
 Fri, 11 Oct 2013 18:39:52 +0000 (UTC)
Received: (qmail 95930 invoked by uid 500); 11 Oct 2013 18:39:51 -0000
Delivered-To: apmail-poi-commits-archive@poi.apache.org
Received: (qmail 95890 invoked by uid 500); 11 Oct 2013 18:39:48 -0000
Mailing-List: contact commits-help@poi.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@poi.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@poi.apache.org>
List-Post: <mailto:commits@poi.apache.org>
List-Id: <commits.poi.apache.org>
Reply-To: dev@poi.apache.org
Delivered-To: mailing list commits@poi.apache.org
Received: (qmail 95870 invoked by uid 99); 11 Oct 2013 18:39:47 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Oct 2013 18:39:47 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Oct 2013 18:39:44 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 3283E2388A29;
	Fri, 11 Oct 2013 18:39:23 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1531386 - in /poi/trunk:
 src/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java
 src/java/org/apache/poi/ss/formula/functions/Bin2Dec.java
 test-data/spreadsheet/FormulaEvalTestData.xls
Date: Fri, 11 Oct 2013 18:39:23 -0000
To: commits@poi.apache.org
From: cedricwalter@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20131011183923.3283E2388A29@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: cedricwalter
Date: Fri Oct 11 18:39:22 2013
New Revision: 1531386

URL: http://svn.apache.org/r1531386
Log:
Bug 55055: patch for missing function Bin2Dec

Added:
    poi/trunk/src/java/org/apache/poi/ss/formula/functions/Bin2Dec.java
Modified:
    poi/trunk/src/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java
    poi/trunk/test-data/spreadsheet/FormulaEvalTestData.xls

Modified: poi/trunk/src/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java?rev=1531386&r1=1531385&r2=1531386&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java Fri Oct 11 18:39:22 2013
@@ -67,7 +67,7 @@ public final class AnalysisToolPak imple
         r(m, "BESSELJ", null);
         r(m, "BESSELK", null);
         r(m, "BESSELY", null);
-        r(m, "BIN2DEC", null);
+        r(m, "BIN2DEC", Bin2Dec.instance);
         r(m, "BIN2HEX", null);
         r(m, "BIN2OCT", null);
         r(m, "COMPLEX", Complex.instance);

Added: poi/trunk/src/java/org/apache/poi/ss/formula/functions/Bin2Dec.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/functions/Bin2Dec.java?rev=1531386&view=auto
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/functions/Bin2Dec.java (added)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/functions/Bin2Dec.java Fri Oct 11 18:39:22 2013
@@ -0,0 +1,95 @@
+package org.apache.poi.ss.formula.functions;
+
+import org.apache.poi.ss.formula.OperationEvaluationContext;
+import org.apache.poi.ss.formula.eval.*;
+
+/**
+ * Implementation for Excel Bin2Dec() function.<p/>
+ * <p/>
+ * <b>Syntax</b>:<br/> <b>Bin2Dec  </b>(<b>number</b>)<br/>
+ * <p/>
+ * Converts a binary number to decimal.
+ * <p/>
+ * Number is the binary number you want to convert. Number cannot contain more than 10 characters (10 bits).
+ * The most significant bit of number is the sign bit. The remaining 9 bits are magnitude bits.
+ * Negative numbers are represented using two's-complement notation.
+ * <p/>
+ * Remark
+ * If number is not a valid binary number, or if number contains more than 10 characters (10 bits),
+ * BIN2DEC returns the #NUM! error value.
+ *
+ * @author cedric dot walter @ gmail dot com
+ */
+public class Bin2Dec extends Fixed1ArgFunction implements FreeRefFunction {
+
+    public static final FreeRefFunction instance = new Bin2Dec();
+
+    public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval numberVE) {
+        String number = OperandResolver.coerceValueToString(numberVE);
+        if (number.length() > 10) {
+            return ErrorEval.NUM_ERROR;
+        }
+
+        String unsigned;
+
+        //If the leftmost bit is 0 -- number is positive.
+        boolean isPositive;
+        if (number.length() < 10) {
+            unsigned = number;
+            isPositive = true;
+        } else {
+            unsigned = number.substring(1);
+            isPositive = number.startsWith("0");
+        }
+
+        String value;
+        int sum;
+        if (isPositive) {
+            //bit9*2^8 + bit8*2^7 + bit7*2^6 + bit6*2^5 + bit5*2^4+ bit3*2^2+ bit2*2^1+ bit1*2^0
+            sum = getDecimalValue(unsigned);
+            value = String.valueOf(sum);
+        } else {
+            //The leftmost bit is 1 -- this is negative number
+            //Inverse bits [1-9]
+            String inverted = toggleBits(unsigned);
+            // Calculate decimal number
+            sum = getDecimalValue(inverted);
+
+            //Add 1 to obtained number
+            sum++;
+
+            value = "-" + String.valueOf(sum);
+        }
+
+        return new NumberEval(Long.parseLong(value));
+    }
+
+    private int getDecimalValue(String unsigned) {
+        int sum = 0;
+        int numBits = unsigned.length();
+        int power = numBits - 1;
+
+        for (int i = 0; i < numBits; i++) {
+            int bit = Integer.parseInt(unsigned.substring(i, i + 1));
+            int term = (int) (bit * Math.pow(2, power));
+            sum += term;
+            power--;
+        }
+        return sum;
+    }
+
+    private static String toggleBits(String s) {
+        long i = Long.parseLong(s, 2);
+        long i2 = i ^ ((1L << s.length()) - 1);
+        String s2 = Long.toBinaryString(i2);
+        while (s2.length() < s.length()) s2 = '0' + s2;
+        return s2;
+    }
+
+    public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
+        if (args.length != 1) {
+            return ErrorEval.VALUE_INVALID;
+        }
+        return evaluate(ec.getRowIndex(), ec.getColumnIndex(), args[0]);
+    }
+}

Modified: poi/trunk/test-data/spreadsheet/FormulaEvalTestData.xls
URL: http://svn.apache.org/viewvc/poi/trunk/test-data/spreadsheet/FormulaEvalTestData.xls?rev=1531386&r1=1531385&r2=1531386&view=diff
==============================================================================
Binary files - no diff available.



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org