update 233

selfboot · Apr 28, 2016 · d4a1e82 · d4a1e82
1 parent c27abb3
commit d4a1e82
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 1 deletion.
diff --git a/Math/233_NumberOfDigitOne.cpp b/Math/233_NumberOfDigitOne.cpp
@@ -0,0 +1,37 @@
+/*
+ * @Author: xuezaigds@gmail.com
+ * @Last Modified time: 2016-04-28 13:58:30
+ */
+
+class Solution {
+public:
+    int countDigitOne(int n)
+    {
+        if(n<=0) return 0;
+        long long count = 1;
+        while(n){
+            if(n<10){
+                break;
+            }
+            int digit = n % 10;
+            n /= 10;
+            count += n;
+            if(digit == 0)  count -= 1;
+            count += countDigitOne(n-1) * 10;
+
+            // 最后一行中数组1出现的次数
+            while(n){
+                if(n%10==1) count += digit+1;
+                n /= 10;
+            }
+        }
+        return count;
+    }
+};
+
+/*
+-1
+6
+12
+234545
+*/
diff --git a/Math/233_NumberOfDigitOne.py b/Math/233_NumberOfDigitOne.py
@@ -13,7 +13,7 @@ def countDigitOne(self, n):
         else:
             units = n % 10
             tens = n / 10
-            count = self.countDigitOne(tens-1) * 10 + tens
+            count = self.countDigitOne(tens - 1) * 10 + tens
             n /= 10
             while n:
                 if n % 10 == 1: