Permalink
Browse files

Merge branch 'release/0.3.4'

  • Loading branch information...
rimms committed Nov 26, 2012
2 parents 6353090 + 90731a2 commit 5b3a40a90e1a159c63c17f337010b497027cc7a3
Showing 326 changed files with 1,595 additions and 1,364 deletions.
View
44 LICENSE
@@ -456,47 +456,3 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.
END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Libraries
-
- If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
- To apply these terms, attach the following notices to the library. It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
- <one line to give the library's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
- <signature of Ty Coon>, 1 April 1990
- Ty Coon, President of Vice
-
-That's all there is to it!
View
@@ -31,6 +31,19 @@ LGPL 2.1
Update history
--------------
+Release 0.3.4 2012/11/26
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+Improvements
+ - Add --logdir option
+ - Add --enable-debug option to configure (#130)
+ - Catch bad cast of fv_converter (#170)
+
+Bugfix
+ - Plugin basename specification does not work correctly (#57)
+ - MIX put_diff/get_diff and update/analyze RPC can be executed on the same time (#171)
+ - #121, #131, #136, #150, #155, #156, #157, #160, #163, #165, #167, #172, #179, #180
+
Release 0.3.3 2012/10/29
~~~~~~~~~~~~~~~~~~~~~~~~
View
@@ -3,8 +3,7 @@
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
+// License version 2.1 as published by the Free Software Foundation.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
View
@@ -3,8 +3,7 @@
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
+// License version 2.1 as published by the Free Software Foundation.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -3,8 +3,7 @@
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
+// License version 2.1 as published by the Free Software Foundation.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -3,8 +3,7 @@
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
+// License version 2.1 as published by the Free Software Foundation.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -3,8 +3,7 @@
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
+// License version 2.1 as published by the Free Software Foundation.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -3,8 +3,7 @@
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
+// License version 2.1 as published by the Free Software Foundation.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -3,8 +3,7 @@
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
+// License version 2.1 as published by the Free Software Foundation.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -1,140 +0,0 @@
-// Jubatus: Online machine learning framework for distributed environment
-// Copyright (C) 2011 Preferred Infrastructure and Nippon Telegraph and Telephone Corporation.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-#include <iostream>
-#include <vector>
-#include <fstream>
-#include <string>
-#include <sstream>
-#include "classifier.hpp"
-#include "../storage/local_storage.hpp"
-
-using namespace std;
-using namespace jubatus;
-
-static const char* train_news20 = "/home/hillbig/pfiprojects-git/jubatus/classifier/news20";
-
-
-void InitClassifiers(vector<classifier_base*>& classifiers){
- classifiers.push_back(new perceptron(new local_storage));
- classifiers.push_back(new PA(new local_storage));
- classifiers.push_back(new PA1(new local_storage));
- classifiers.push_back(new PA2(new local_storage));
- classifiers.push_back(new CW(new local_storage));
- classifiers.push_back(new AROW(new local_storage));
- classifiers.push_back(new NHERD(new local_storage));
- for (size_t i = 0; i < classifiers.size(); ++i){
- classifiers[i]->set_C(1.0);
- }
-}
-
-void Eval(vector<pair<sfv_t, string> >& examples,
- vector<classifier_base*>& classifiers){
- vector<int> correct_num(classifiers.size());
- int all_num = 0;
- random_shuffle(examples.begin(), examples.end());
- vector< map<string, map<string, int> > > counter(classifiers.size());
- for (size_t i = 0; i < examples.size(); ++i){
- all_num++;
- for (size_t j = 0; j < classifiers.size(); ++j){
- string label = classifiers[j]->classify(examples[i].first);
- counter[j][label][examples[i].second]++;
- classifiers[j]->train(examples[i].first, examples[i].second);
-
- if (label == examples[i].second){
- correct_num[j]++;
- }
-
- }
- }
-
- for (size_t i = 0; i < classifiers.size(); ++i){
- cout << classifiers[i]->name() << "\t" << (float)correct_num[i] / all_num << endl;
- /*
- for (map<int, map<int, int> >::const_iterator it =
- counter[i].begin(); it != counter[i].end(); ++it){
- cout << it->first << "\t";
- map<int, int>::const_iterator it2 = it->second.begin();
- for (; it2 != it->second.end(); ++it2){
- cout << it2->first << ":" << it2->second << " ";
- }
- cout << endl;
- }
- */
- }
-}
-
-void TestAll(){
- vector<classifier_base*> classifiers;
- InitClassifiers(classifiers);
-
- vector<pair<sfv_t, string> > examples;
- for (int i = 0; i < 100; ++i){
- sfv_t sfv;
- sfv.push_back(make_pair("0", 1.0));
- sfv.push_back(make_pair("1", 1.0));
- sfv.push_back(make_pair("2", 1.0));
- sfv.push_back(make_pair("3", 1.0));
- examples.push_back(make_pair(sfv, "0"));
- }
-
- for (int i = 0; i < 100; ++i){
- sfv_t sfv;
- sfv.push_back(make_pair("2", 1.0));
- sfv.push_back(make_pair("3", 1.0));
- sfv.push_back(make_pair("4", 1.0));
- sfv.push_back(make_pair("5", 1.0));
- examples.push_back(make_pair(sfv, "1"));
- }
-
- Eval(examples, classifiers);
-
- //FAIL();
-}
-
-
-int main(int argc, char* argv[]){
- vector<classifier_base*> classifiers;
- InitClassifiers(classifiers);
-
- ifstream ifs(train_news20);
- if (!ifs){
- return -1;
- }
- char buf[1024];
- vector<pair<sfv_t, string> > examples;
- for (string line; getline(ifs, line); ){
- string label;
- istringstream is(line);
- is >> label;
- int id;
- char sep;
- float val;
- sfv_t sfv;
- while (is >> id >> sep >> val){
- snprintf(buf, 1024, "%d", id);
- sfv.push_back(make_pair(buf, val));
- }
- examples.push_back(make_pair(sfv, label));
-
- if (examples.size() == 1000) break; // too slow when using local_storage
- }
- Eval(examples, classifiers);
- //FAIL();
-}
-
-
@@ -3,8 +3,7 @@
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
+// License version 2.1 as published by the Free Software Foundation.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -3,8 +3,7 @@
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
+// License version 2.1 as published by the Free Software Foundation.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -3,8 +3,7 @@
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
+// License version 2.1 as published by the Free Software Foundation.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -3,8 +3,7 @@
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
+// License version 2.1 as published by the Free Software Foundation.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
View
@@ -3,8 +3,7 @@
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
+// License version 2.1 as published by the Free Software Foundation.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
View
@@ -3,8 +3,7 @@
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
+// License version 2.1 as published by the Free Software Foundation.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
View
@@ -3,8 +3,7 @@
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
+// License version 2.1 as published by the Free Software Foundation.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
View
@@ -3,8 +3,7 @@
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
+// License version 2.1 as published by the Free Software Foundation.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
View
@@ -3,8 +3,7 @@
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
+// License version 2.1 as published by the Free Software Foundation.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
View
@@ -3,8 +3,7 @@
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
+// License version 2.1 as published by the Free Software Foundation.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
View
@@ -3,8 +3,7 @@
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
+// License version 2.1 as published by the Free Software Foundation.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
View
@@ -3,8 +3,7 @@
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
+// License version 2.1 as published by the Free Software Foundation.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
Oops, something went wrong.

0 comments on commit 5b3a40a

Please sign in to comment.