From: Pierre <ratinaud@univ-tlse2.fr>
Date: Wed, 30 Jan 2013 22:32:00 +0000 (+0100)
Subject: Merge branch 'master' of http://www.netdig.org/git/iramuteq
X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=commitdiff_plain;h=9d5358d31d7438dfa92c9112adb2ae471ad95aae;hp=e525a32fa83bf1a174b743139e3d30990799c47c

Merge branch 'master' of netdig.org/git/iramuteq
---

diff --git a/Rscripts/afc_graph.R b/Rscripts/afc_graph.R
index e4b0617..a0d178e 100644
--- a/Rscripts/afc_graph.R
+++ b/Rscripts/afc_graph.R
@@ -1,5 +1,5 @@
 #Author: Pierre Ratinaud
-#Copyright (c) 20010 Pierre Ratinaud
+#Copyright (c) 20010-2013 Pierre Ratinaud
 #Lisense: GNU/GPL
 
 
diff --git a/checkinstall.py b/checkinstall.py
index 927f847..9dac15e 100644
--- a/checkinstall.py
+++ b/checkinstall.py
@@ -100,7 +100,7 @@ def FindRPAthWin32():
         for progpath in progpaths :
             rpath = os.path.join(progpath, "R")
         if os.path.exists(rpath) :
-            for i in range(7,20):
+            for i in range(13,20):
                 for j in range(0,15):
                     path=os.path.join(rpath,"R-2."+str(i)+"."+str(j),'bin','R.exe')
                     if os.path.exists(path):
diff --git a/configuration/CHD.cfg b/configuration/CHD.cfg
deleted file mode 100644
index 50ce586..0000000
--- a/configuration/CHD.cfg
+++ /dev/null
@@ -1,27 +0,0 @@
-[paths]
-PROFILE_OUT: profiles.txt
-ANTIPRO_OUT: antiprofiles.txt
-AFC3DS_OUT :  AFC3D.jpeg
-AFC2DS_OUT: AFC2D1.jpeg
-AFC3DBC_OUT: AFC3DBC.jpeg
-AFC3DC_OUT: AFC3DCoul.jpeg
-AFC3DP_OUT: AFC3DP.jpeg
-AFC2DL_OUT: AFC2DL.jpeg
-AFC2DSL_OUT: AFC2DSL.jpeg
-AFC2DCL_OUT: AFC2DCL.jpeg
-AFC2DR_OUT: AFC2DR.jpeg
-DENDROC_OUT: DENDROCoul.jpeg
-DENDROH_OUT: DENDROH.jpeg
-DENDROT_OUT: DENDROT.jpeg
-DENDROCOMP_OUT: DENDROCOMP.jpeg
-DENDROCUT_OUT: DENDROCUT.jpeg
-RESULT_CHD: resultats-chd.html
-RESULT_AFC: resultats-afc.html
-RESULT_AFC3D: resultats-afc3d.html
-AFCROUT: C3_AFC.txt
-CONT_OUT: classe_mod.csv
-FILE_ACT_TEMP: fileACTtemp.csv
-FILE_ET_TEMP: fileETtemp.csv
-
-[Resultats]
-AntiProfiles: True
diff --git a/configuration/alceste.cfg b/configuration/alceste.cfg
index 6b9c954..591f045 100644
--- a/configuration/alceste.cfg
+++ b/configuration/alceste.cfg
@@ -4,15 +4,15 @@ mincl = 0
 #nombre de formes par uce, 0=calcul automatique
 nbforme_uce = 0
 #nombre maximum de formes actives
-max_actives = 1500
+max_actives = 3000
 #lemmatisation
 lem = True
 #taille du premier tableau uc/forme
-tailleuc1 = 10
+tailleuc1 = 12
 #nombre de classes terminales de l'analyse, NE PAS EDITER
 nbcl = 4
 #taille du second tableau uc/forme
-tailleuc2 = 12
+tailleuc2 = 14
 #mode de classification, 0=double sur UC, 1=simple sur UCE, 2=simple sur UCI
 classif_mode = 0
 #?????
diff --git a/configuration/global.cfg b/configuration/global.cfg
index c21ece7..864a3d3 100644
--- a/configuration/global.cfg
+++ b/configuration/global.cfg
@@ -2,7 +2,7 @@
 #ne pas editer
 gpl-en = gpl-2.0.txt
 name = iramuteq
-copyright = (c) 2008-2012 Pierre Ratinaud
+copyright = (c) 2008-2013 Pierre Ratinaud
 author = Pierre Ratinaud
 gpl-fr = gpl-2.0-fr.txt
 dev = Pierre Ratinaud (ratinaud@univ-tlse2.fr);Sebastien Dejean