merge with remote

[aggexp.git] / pkg / DESCRIPTION

diff --git a/pkg/DESCRIPTION b/pkg/DESCRIPTION
index 81221fc..f38407a 100644 (file)
--- a/pkg/DESCRIPTION
+++ b/pkg/DESCRIPTION
@@ -1,10 +1,14 @@
-Package: affexp
+Package: aggexp
 Title: aggexp : AGGregation of EXPerts to forecast time-series
 Version: 0.2-3
-Description: Blabla TODO
-Authors: Benjamin Auder <Benjamin.Auder@math.u-psud.fr> [aut,cre],
-       Jean-Michel Poggi <Jean-Michel.Poggi@parisdescartes.fr> [ctb],
-       Bruno Portier <Bruno.Portier@insa-rouen.fr>, [ctb]
+Description: As the title suggests, past predictions of a set of given experts
+    are aggregated until time t to predict at time t+1, (generally) as a weighted
+    sum of values at time t. Several weights optimization algorithm are compared:
+    exponential weights, MLPoly, and some classical statistical learning procedures
+    (Ridge, SVM...).
+Author: Benjamin Auder <Benjamin.Auder@math.u-psud.fr> [aut,cre],
+    Jean-Michel Poggi <Jean-Michel.Poggi@parisdescartes.fr> [ctb],
+    Bruno Portier <Bruno.Portier@insa-rouen.fr>, [ctb]
 Maintainer: Benjamin Auder <Benjamin.Auder@math.u-psud.fr>
 Depends:
     R (>= 3.0)
@@ -16,10 +20,11 @@ LazyData: yes
 URL: http://git.auder.net/?p=aggexp.git
 License: MIT + file LICENSE
 Collate:
-    'aggexp.R'
+    'A_NAMESPACE.R'
     'z_util.R'
     'b_Algorithm.R'
     'b_LinearAlgorithm.R'
+    'd_dataset.R'
     'm_ExponentialWeights.R'
     'm_GeneralizedAdditive.R'
     'm_KnearestNeighbors.R'
@@ -31,3 +36,4 @@ Collate:
     'z_runAlgorithm.R'
     'z_plotHelper.R'
     'z_plot.R'
+RoxygenNote: 5.0.1