Return-Path: X-Original-To: apmail-flink-issues-archive@minotaur.apache.org Delivered-To: apmail-flink-issues-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B320218D70 for ; Sat, 15 Aug 2015 17:47:31 +0000 (UTC) Received: (qmail 68739 invoked by uid 500); 15 Aug 2015 17:47:31 -0000 Delivered-To: apmail-flink-issues-archive@flink.apache.org Received: (qmail 68691 invoked by uid 500); 15 Aug 2015 17:47:31 -0000 Mailing-List: contact issues-help@flink.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flink.apache.org Delivered-To: mailing list issues@flink.apache.org Received: (qmail 68682 invoked by uid 99); 15 Aug 2015 17:47:31 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 15 Aug 2015 17:47:31 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id A9E281AA21B for ; Sat, 15 Aug 2015 17:47:30 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.995 X-Spam-Level: X-Spam-Status: No, score=0.995 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.006, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id lkNUGd-3i_kM for ; Sat, 15 Aug 2015 17:47:24 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id F0450428DF for ; Sat, 15 Aug 2015 17:47:23 +0000 (UTC) Received: (qmail 68617 invoked by uid 99); 15 Aug 2015 17:47:23 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 15 Aug 2015 17:47:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6EAE9DFFD5; Sat, 15 Aug 2015 17:47:23 +0000 (UTC) From: chiwanpark To: issues@flink.incubator.apache.org Reply-To: issues@flink.incubator.apache.org References: In-Reply-To: Subject: [GitHub] flink pull request: [Flink-2030][ml]Data Set Statistics and Histog... Content-Type: text/plain Message-Id: <20150815174723.6EAE9DFFD5@git1-us-west.apache.org> Date: Sat, 15 Aug 2015 17:47:23 +0000 (UTC) Github user chiwanpark commented on a diff in the pull request: https://github.com/apache/flink/pull/861#discussion_r37137658 --- Diff: flink-staging/flink-ml/src/main/scala/org/apache/flink/ml/statistics/CategoricalHistogram.scala --- @@ -0,0 +1,135 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.ml.statistics + +import scala.collection.mutable + +/** Implementation of a discrete valued online histogram + * + * =Parameters= + * -[[numCategories]]: + * Number of categories in the histogram + */ +case class CategoricalHistogram(numCategories: Int) extends OnlineHistogram { + + require(numCategories > 0, "Capacity must be greater than zero") + val data = new mutable.HashMap[Double, Int]() + + /** Number of categories in the histogram + * + * @return number of categories + */ + override def bins: Int = { + numCategories + } + + /** Increment count of category c + * + * @param c category whose count needs to be incremented + */ + override def add(c: Double): Unit = { + if (data.get(c).isEmpty) { + require(data.size < numCategories, "Insufficient capacity. Failed to add.") + data.put(c, 1) + } else { + data.update(c, data.get(c).get + 1) + } + } + + /** Merges the histogram with h and returns a new histogram + * + * @param h histogram to be merged + * @param B number of categories in the resultant histogram. + * (Default: ```0```, number of categories will be the size of union of categories in + * both histograms) + * @return Merged histogram with capacity B + */ + override def merge(h: OnlineHistogram, B: Int = 0): CategoricalHistogram = { + h match { + case h1: CategoricalHistogram => { + val finalMap = new mutable.HashMap[Double, Int]() + data.iterator.foreach(x => finalMap.put(x._1, x._2)) + h1.data.iterator.foreach(x => { + if (finalMap.get(x._1).isEmpty) { + finalMap.put(x._1, x._2) + } else { + finalMap.update(x._1, x._2 + finalMap.get(x._1).get) + } + }) + require(B == 0 || finalMap.size <= B, "Insufficient capacity. Failed to merge") + val countBuffer = new mutable.ArrayBuffer[(Double, Int)]() + finalMap.iterator.foreach(x => countBuffer += ((x._1, x._2))) + var finalSize = finalMap.size + if (B > 0) { + finalSize = B + } + val ret = new CategoricalHistogram(finalSize) + ret.loadData(countBuffer.toArray) + ret + } + case default => + throw new RuntimeException("Only a categorical histogram is allowed to be merged with a " + + "categorical histogram") + } + } + + /** Number of elements in category c + * + * @return Number of points in category c + */ + def count(c: Double): Int = { + if (data.get(c).isEmpty) { + return 0 + } + data.get(c).get + } + + /** Returns the total number of elements in the histogram + * + * @return total number of elements added so far + */ + override def total: Int = { + var result = 0 + data.valuesIterator.foreach(x => result += x) + result + } --- End diff -- We can implement `total` method without mutable variable. ```scala override def total: Int = data.valuesIterator.sum ``` --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastructure@apache.org or file a JIRA ticket with INFRA. ---