You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by ap...@apache.org on 2015/04/10 07:26:26 UTC

[1/2] mahout git commit: (NOJIRA) classify-wikipedia.sh fix for binaries

Repository: mahout
Updated Branches:
  refs/heads/master 8f46ac3e7 -> b7dc3a53a


(NOJIRA) classify-wikipedia.sh fix for binaries


Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/50357a4f
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/50357a4f
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/50357a4f

Branch: refs/heads/master
Commit: 50357a4f48a8307bd1b84858dda5765f70940b94
Parents: f208b8a
Author: Andrew Palumbo <ap...@apache.org>
Authored: Fri Apr 10 01:21:29 2015 -0400
Committer: Andrew Palumbo <ap...@apache.org>
Committed: Fri Apr 10 01:21:29 2015 -0400

----------------------------------------------------------------------
 examples/bin/classify-wikipedia.sh   |   4 +-
 examples/bin/resources/country.txt   | 229 ++++++++++++++++++++++++++++++
 examples/bin/resources/country10.txt |  10 ++
 examples/bin/resources/country2.txt  |   2 +
 4 files changed, 243 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mahout/blob/50357a4f/examples/bin/classify-wikipedia.sh
----------------------------------------------------------------------
diff --git a/examples/bin/classify-wikipedia.sh b/examples/bin/classify-wikipedia.sh
index 1b342ea..470a81c 100755
--- a/examples/bin/classify-wikipedia.sh
+++ b/examples/bin/classify-wikipedia.sh
@@ -93,13 +93,13 @@ if [ "x$alg" == "xCBayes" ] || [ "x$alg" == "xBinaryCBayes" ] ; then
   
   if [ "x$alg" == "xCBayes" ] ; then
     # use a list of 10 countries as categories
-    cp $MAHOUT_HOME/examples/src/test/resources/country10.txt ${WORK_DIR}/country.txt
+    cp $MAHOUT_HOME/examples/bin/resources/country10.txt ${WORK_DIR}/country.txt
     chmod 666 ${WORK_DIR}/country.txt
   fi
   
   if [ "x$alg" == "xBinaryCBayes" ] ; then
     # use United States and United Kingdom as categories
-    cp $MAHOUT_HOME/examples/src/test/resources/country2.txt ${WORK_DIR}/country.txt
+    cp $MAHOUT_HOME/examples/bin/resources/country2.txt ${WORK_DIR}/country.txt
     chmod 666 ${WORK_DIR}/country.txt
   fi
 

http://git-wip-us.apache.org/repos/asf/mahout/blob/50357a4f/examples/bin/resources/country.txt
----------------------------------------------------------------------
diff --git a/examples/bin/resources/country.txt b/examples/bin/resources/country.txt
new file mode 100644
index 0000000..6a22091
--- /dev/null
+++ b/examples/bin/resources/country.txt
@@ -0,0 +1,229 @@
+Afghanistan
+Albania
+Algeria
+American Samoa
+Andorra
+Angola
+Anguilla
+Antigua and Barbuda
+Argentina
+Armenia
+Aruba
+Australia
+Austria
+Azerbaijan
+Bahamas
+Bangladesh
+Barbados
+Belarus
+Belgium
+Belize
+Benin
+Bermuda
+Bhutan
+Bolivia
+Bosnia and Herzegovina
+Botswana
+Bouvet Island
+Brazil
+British Indian Ocean Territory
+Brunei Darussalam
+Bulgaria
+Burkina Faso
+Burundi
+Cambodia
+Cameroon
+Canada
+Cape Verde
+Cayman Islands
+Central African Republic
+Chad
+Chile
+China
+Christmas Island
+Cocos  Islands
+Colombia
+Comoros
+Congo
+Cook Islands
+Costa Rica
+Croatia
+C�te d'Ivoire
+Cuba
+Cyprus
+Czech Republic
+Djibouti
+Dominica
+Dominican Republic
+Ecuador
+Egypt
+El Salvador
+Equatorial Guinea
+Eritrea
+Estonia
+Ethiopia
+Falkland Islands 
+Faroe Islands
+Fiji
+Finland
+France
+French Guiana
+French Polynesia
+French Southern Territories
+Gabon
+Georgia
+Germany
+Ghana
+Gibraltar
+Greece
+Greenland
+Grenada
+Guadeloupe
+Guam
+Guatemala
+Guernsey
+Guinea
+Guinea-Bissau
+Guyana
+Haiti
+Honduras
+Hong Kong
+Hungary
+Iceland
+India
+Indonesia
+Iran
+Iraq
+Ireland
+Isle of Man
+Israel
+Italy
+Japan
+Jersey
+Jordan
+Kazakhstan
+Kenya
+Kiribati
+Korea
+Kuwait
+Kyrgyzstan
+Latvia
+Lebanon
+Lesotho
+Liberia
+Liechtenstein
+Lithuania
+Luxembourg
+Macedonia
+Madagascar
+Malawi
+Malaysia
+Maldives
+Mali
+Malta
+Marshall Islands
+Martinique
+Mauritania
+Mauritius
+Mayotte
+Mexico
+Micronesia
+Moldova
+Monaco
+Mongolia
+Montenegro
+Montserrat
+Morocco
+Mozambique
+Myanmar
+Namibia
+Nauru
+Nepal
+Netherlands
+Netherlands Antilles
+New Caledonia
+New Zealand
+Nicaragua
+Niger
+Nigeria
+Niue
+Norfolk Island
+Northern Mariana Islands
+Norway
+Oman
+Pakistan
+Palau
+Palestinian Territory
+Panama
+Papua New Guinea
+Paraguay
+Peru
+Philippines
+Pitcairn
+Poland
+Portugal
+Puerto Rico
+Qatar
+R�union
+Russian Federation
+Rwanda
+Saint Barth�lemy
+Saint Helena
+Saint Kitts and Nevis
+Saint Lucia
+Saint Martin 
+Saint Pierre and Miquelon
+Saint Vincent and the Grenadines
+Samoa
+San Marino
+Sao Tome and Principe
+Saudi Arabia
+Senegal
+Serbia
+Seychelles
+Sierra Leone
+Singapore
+Slovakia
+Slovenia
+Solomon Islands
+Somalia
+South Africa
+South Georgia and the South Sandwich Islands
+Spain
+Sri Lanka
+Sudan
+Suriname
+Svalbard and Jan Mayen
+Swaziland
+Sweden
+Switzerland
+Syrian Arab Republic
+Taiwan
+Tanzania
+Thailand
+Timor-Leste
+Togo
+Tokelau
+Tonga
+Trinidad and Tobago
+Tunisia
+Turkey
+Turkmenistan
+Turks and Caicos Islands
+Tuvalu
+Ukraine
+United Arab Emirates
+United Kingdom
+United States
+United States Minor Outlying Islands
+Uruguay
+Uzbekistan
+Vanuatu
+Vatican 
+Venezuela
+Vietnam
+Virgin Islands
+Wallis and Futuna
+Yemen
+Zambia
+Zimbabwe

http://git-wip-us.apache.org/repos/asf/mahout/blob/50357a4f/examples/bin/resources/country10.txt
----------------------------------------------------------------------
diff --git a/examples/bin/resources/country10.txt b/examples/bin/resources/country10.txt
new file mode 100644
index 0000000..97a63e1
--- /dev/null
+++ b/examples/bin/resources/country10.txt
@@ -0,0 +1,10 @@
+Australia
+Austria
+Bahamas
+Canada
+Colombia
+Cuba
+Panama
+Pakistan
+United Kingdom
+Vietnam

http://git-wip-us.apache.org/repos/asf/mahout/blob/50357a4f/examples/bin/resources/country2.txt
----------------------------------------------------------------------
diff --git a/examples/bin/resources/country2.txt b/examples/bin/resources/country2.txt
new file mode 100644
index 0000000..f4b4f61
--- /dev/null
+++ b/examples/bin/resources/country2.txt
@@ -0,0 +1,2 @@
+United States
+United Kingdom


[2/2] mahout git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/mahout

Posted by ap...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/mahout


Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/b7dc3a53
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/b7dc3a53
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/b7dc3a53

Branch: refs/heads/master
Commit: b7dc3a53af3250123f8ef82e3f259657991dfaa9
Parents: 50357a4 8f46ac3
Author: Andrew Palumbo <ap...@apache.org>
Authored: Fri Apr 10 01:23:00 2015 -0400
Committer: Andrew Palumbo <ap...@apache.org>
Committed: Fri Apr 10 01:23:00 2015 -0400

----------------------------------------------------------------------
 distribution/pom.xml | 18 +++++++++++++++++-
 examples/pom.xml     |  2 +-
 h2o/pom.xml          |  2 +-
 hdfs/pom.xml         |  2 +-
 integration/pom.xml  |  2 +-
 math-scala/pom.xml   |  2 +-
 math/pom.xml         |  2 +-
 mr/pom.xml           |  2 +-
 pom.xml              |  2 +-
 spark-shell/pom.xml  |  2 +-
 spark/pom.xml        |  2 +-
 11 files changed, 27 insertions(+), 11 deletions(-)
----------------------------------------------------------------------