From aba7bc12131fc6b38f7ca8f08a717254d0bb8277 Mon Sep 17 00:00:00 2001 From: "Yann Esposito (Yogsototh)" Date: Sat, 24 Sep 2016 14:08:58 +0200 Subject: [PATCH] wip to compile it again with XCode on Sierra --- .DS_Store | Bin 12292 -> 0 bytes .gitignore | 1 + dees.xcodeproj/project.pbxproj | 55 +++++++++-- .../contents.xcworkspacedata | 7 ++ .../UserInterfaceState.xcuserstate | Bin 0 -> 17544 bytes .../xcschemes/dees.xcscheme | 91 ++++++++++++++++++ .../xcschemes/xcschememanagement.plist | 22 +++++ general.H | 6 +- interface.H | 2 +- interface.cpp | 10 +- ma.H | 4 +- ma.cpp | 4 +- main.cpp | 11 +-- pfa.cpp | 2 +- pprfa.H | 4 +- pprfa_dees.cpp | 6 +- sample.H | 2 +- sample.cpp | 2 +- test.cpp | 2 +- 19 files changed, 194 insertions(+), 37 deletions(-) delete mode 100644 .DS_Store create mode 100644 dees.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 dees.xcodeproj/project.xcworkspace/xcuserdata/esposito.xcuserdatad/UserInterfaceState.xcuserstate create mode 100644 dees.xcodeproj/xcuserdata/esposito.xcuserdatad/xcschemes/dees.xcscheme create mode 100644 dees.xcodeproj/xcuserdata/esposito.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index a4faf749a84dbe41df8ceba42098ec4bc7501a90..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12292 zcmeI1&raJw5XNT{Cpbh@Tq?oM9D70H(7T1GRL;Fss?;XoPb5R20f`HeFMWVML?5CL z(Ff>5^cmzrCqso$dAan|3=j(^_7Od=xg@OE|}vLhlny4vkAhD6iz+FPv` zXLey7{N=b>OefW1g4f$EH77`b1W14cNPqEaN_6^7WUw_y_Ct%BH>tHd1=7KA1aCNc7aItc5!5!zzsIP+!?&AE) zh!af}A*{WQ7_nIrBL%3IB)t#+@w)wAWank*KT=D6hp-S`wwk>nId z`xviMDY&mD=s4+_xWGm#eWW~>Nh0B2CU#WWM2B*L^g2`PeKYP^)TWZLmymm%l1#>R zxSxGz;)Wc8J{8+u!Uhm3(C*0JP2|B!orv2zHp-FS8tkXFv9lk>Lo<2wNX578Hf4#d zFW^zF+X{nMW`+ET&yzKD_x3*+{TTZBYK^;YMvYZQEw9u%ma68p<}PSngD)npq0uK| zXD^L57k$$#F(&V@#?G#derWXP&F!!I%xX)0W8$%02g~Qba$qBY=O)k(3G8V7|EBx< z|L0DV>yrQp{6zvTJ9>9?hy`M8-C9a(?E?KHx;E9-!Fm@Az8r`32SXeekg87^ rZ5=FT(D+4w$H0LENPq-LfCNZ@1W14cNPq-LfCNZ@1W14c{wRUp8#6y# diff --git a/.gitignore b/.gitignore index 90ec22b..2c430c3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .svn +.DS_Store diff --git a/dees.xcodeproj/project.pbxproj b/dees.xcodeproj/project.pbxproj index 4fca345..02925d0 100644 --- a/dees.xcodeproj/project.pbxproj +++ b/dees.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 42; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -203,10 +203,19 @@ /* Begin PBXProject section */ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; + attributes = { + LastUpgradeCheck = 0800; + }; buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "dees" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; hasScannedForEncodings = 1; + knownRegions = ( + en, + ); mainGroup = 08FB7794FE84155DC02AAC07 /* dees */; projectDirPath = ""; + projectRoot = ""; targets = ( 8DD76F620486A84900D96B5E /* dees */, ); @@ -241,7 +250,6 @@ COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; INSTALL_PATH = "$(HOME)/bin"; LIBRARY_SEARCH_PATHS = ( @@ -249,6 +257,7 @@ "$(SRCROOT)/lib", ); PRODUCT_NAME = dees; + SDKROOT = macosx; ZERO_LINK = YES; }; name = Debug; @@ -256,38 +265,66 @@ 1DEB923308733DC60010E9CD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_MODEL_TUNING = G5; INSTALL_PATH = "$(HOME)/bin"; LIBRARY_SEARCH_PATHS = ( "$(LIBRARY_SEARCH_PATHS)", "$(SRCROOT)/lib", ); PRODUCT_NAME = dees; + SDKROOT = macosx; }; name = Release; }; 1DEB923608733DC60010E9CD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + ONLY_ACTIVE_ARCH = YES; PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk"; }; name = Debug; }; 1DEB923708733DC60010E9CD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk"; }; name = Release; }; diff --git a/dees.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/dees.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/dees.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/dees.xcodeproj/project.xcworkspace/xcuserdata/esposito.xcuserdatad/UserInterfaceState.xcuserstate b/dees.xcodeproj/project.xcworkspace/xcuserdata/esposito.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000000000000000000000000000000000000..0daa4dd2bb2bb55a4626f26375ffad62f1389513 GIT binary patch literal 17544 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 CaJ&Qn literal 0 HcmV?d00001 diff --git a/dees.xcodeproj/xcuserdata/esposito.xcuserdatad/xcschemes/dees.xcscheme b/dees.xcodeproj/xcuserdata/esposito.xcuserdatad/xcschemes/dees.xcscheme new file mode 100644 index 0000000..86fb812 --- /dev/null +++ b/dees.xcodeproj/xcuserdata/esposito.xcuserdatad/xcschemes/dees.xcscheme @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dees.xcodeproj/xcuserdata/esposito.xcuserdatad/xcschemes/xcschememanagement.plist b/dees.xcodeproj/xcuserdata/esposito.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..9d162a5 --- /dev/null +++ b/dees.xcodeproj/xcuserdata/esposito.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,22 @@ + + + + + SchemeUserState + + dees.xcscheme + + orderHint + 0 + + + SuppressBuildableAutocreation + + 8DD76F620486A84900D96B5E + + primary + + + + + diff --git a/general.H b/general.H index c5c308d..b459e90 100644 --- a/general.H +++ b/general.H @@ -18,16 +18,18 @@ #ifndef GENERAL_H #define GENERAL_H -using namespace std; + #include #include #include -//#include +#include //#include #include // pour cout << #include // pour fic << #include +using namespace std; + // ------------- pour le portage -------------- // pour compiler sur le ppc diff --git a/interface.H b/interface.H index b93f2aa..5785d8e 100644 --- a/interface.H +++ b/interface.H @@ -1,4 +1,4 @@ -#ifndef _INTERFACE_H +#ifndef INTERFACE_H #define INTERFACE_H #include "main.H" void Y(); diff --git a/interface.cpp b/interface.cpp index 0df2021..0fffc21 100644 --- a/interface.cpp +++ b/interface.cpp @@ -70,7 +70,7 @@ void proportion_PRFA() for (j = 0; j < nb_try; ++j) { A.becomeRandomMax(i,2,0,nb_moy_succ, 1, i); - taille_auto = A.size (); + taille_auto = (int) A.size (); if (taille_auto == (unsigned int) i) { if (A.isPFA ()) @@ -338,7 +338,7 @@ void Apprentissage_unique() string str; float tmp; float precision; - T_ModeReturn moderet=begin; + T_ModeReturn moderet=::begin; T_ModeEpsilon modeeps=epsfixed; int max_etats=INT_MAX; @@ -348,7 +348,7 @@ void Apprentissage_unique() cout << "1 - La precision .................. : " << precision << "\n"; cout << "2 - Le mode de retour ............. : " - << (moderet==begin?"begin":"end") << "\n"; + << (moderet==::begin?"begin":"end") << "\n"; cout << "3 - Le mode de gestion de epsilon . : " << (modeeps==epsfixed?"epsfixed": (modeeps==variable?"variable":"word_variable")) @@ -377,9 +377,9 @@ void Apprentissage_unique() cout << "mode de retour (begin|end|b|e) : "; cin >> str; if ((str=="end") || (str == "e")) - moderet=end; + moderet=::end; else - moderet=begin; + moderet=::begin; } else if (reponse == "3") { // mode de gestion de epsilon diff --git a/ma.H b/ma.H index f031814..ab45077 100644 --- a/ma.H +++ b/ma.H @@ -124,9 +124,9 @@ public: // true if the MA is empty inline bool empty() const {return Q.empty();} // return the size of the MA - inline unsigned int size () const {return Q.size ();} + inline unsigned long size () const {return Q.size ();} // return the number of letter of the MA - inline unsigned int nb_lettres () const {return Sigma.size ();} + inline unsigned long nb_lettres () const {return Sigma.size ();} // return safely iota[q] (even if iota[q]=0) inline float val_iota (const State q) const { SFunc::const_iterator i = iota.find (q); diff --git a/ma.cpp b/ma.cpp index ce68748..afaa2a1 100644 --- a/ma.cpp +++ b/ma.cpp @@ -249,7 +249,7 @@ MA::save_dot (const char *Filename, } ofstream fp (Filename); - if (fp == NULL) + if (!fp) { throw 1; } @@ -795,7 +795,7 @@ RESULT MA::load (const char *Filename) if (Filename == NULL) throw - 1; ifstream fp (Filename); - if (fp == NULL) + if (!fp) throw - 2; fp.precision (30); string buf; diff --git a/main.cpp b/main.cpp index ca1f36e..3f2f436 100644 --- a/main.cpp +++ b/main.cpp @@ -15,7 +15,6 @@ * * ***************************************************************************/ -using namespace std; #include "interface.H" #include "test.H" #include "main.H" @@ -72,7 +71,7 @@ bool viewmultipletransitions=false; // vrai pour ne plus regrouper les transitio bool interactive=false; // interactive mode // L'apprentissage -T_ModeReturn moderet = end; // Le mode de retour des arÍtes (end ou begin) +T_ModeReturn moderet = ::end; // Le mode de retour des arÍtes (end ou begin) T_ModeEpsilon modeeps = variable; // Le mode d'apprentissage avec epsilon fixe ou variable (epsfixed ou variable) float test_proportion = 0.2; // la proportion de l'echantillon attribuee au test int nb_tours = 100; // Le nombre d'itÈrations pour Baum Welch @@ -590,7 +589,7 @@ void affiche_PSe(void) { cout << "res = " << res << endl; for (q=PSe.begin() ; q != PSe.end() ; q++) { - cout << "P_" << q->first << "(\Se) = " << q-> second << endl; + cout << "P_" << q->first << "(\\Se) = " << q-> second << endl; } } @@ -713,9 +712,9 @@ initialise_arguments (int argc, char *argv[]) { arg = argv[++i]; if (arg == "begin") - moderet = begin; + moderet = ::begin; else - moderet = end; + moderet = ::end; } else if (arg == "--modeeps") { @@ -1321,4 +1320,4 @@ main (int argc, char *argv[]) affiche_utilisation (); return -1; } -} \ No newline at end of file +} diff --git a/pfa.cpp b/pfa.cpp index 23f081f..c8cab2e 100644 --- a/pfa.cpp +++ b/pfa.cpp @@ -340,7 +340,7 @@ PFA::perplexite (const Sample & S) const res = sum = 0; for (w = S.begin (); w != S.end (); S.next (w)) { - res += log (r(w->first)) * w->second; + res += log (p(w->first)) * w->second; sum += w->second; } } diff --git a/pprfa.H b/pprfa.H index 723f9f7..1bb8beb 100644 --- a/pprfa.H +++ b/pprfa.H @@ -26,7 +26,6 @@ #include "pfa.H" #include "simplex.H" - typedef enum {determinist, positive, nonconstrained} T_ModeVariables; typedef enum {begin, end} T_ModeReturn; typedef enum {epsfixed, variable, word_variable} T_ModeEpsilon; @@ -130,7 +129,7 @@ public: const double prec, // The precision parameter const double epsprime, // The bound under which transition are erased const bool verbose = false, // verbose mode (show the states during construction) - const T_ModeReturn moderet = end, // return mode (end of the tree or begin of the tree) + const T_ModeReturn moderet = ::end, // return mode (end of the tree or begin of the tree) const T_ModeEpsilon modeeps = variable, // epsilon mode (epsfixed or variable) unsigned int maxstates = INT_MAX, // The maximal states number after which learning is cancelled unsigned int seuil=10, // La periodicitÈ minimum avant de ne plus considÈrer l'Ètat @@ -175,5 +174,4 @@ protected: RESULT compute_XR(void); }; - #endif diff --git a/pprfa_dees.cpp b/pprfa_dees.cpp index 871b0ce..56c8224 100644 --- a/pprfa_dees.cpp +++ b/pprfa_dees.cpp @@ -42,10 +42,10 @@ PPRFA::DEES (T_ModeVariables modeVariables, cout << "\nmoderet = "; switch (moderet) { - case begin: + case ::begin: cout << "begin"; break; - case end: + case ::end: cout << "end"; } cout << "\nmodeeps = "; @@ -533,4 +533,4 @@ RESULT PPRFA::sol (T_ModeVariables modeVariables, // le mode dans lequel renvoye return solmax (modeVariables,solution, v, S, simplx,precision, moderet, modeeps, W, INT_MAX); } */ -} \ No newline at end of file +} diff --git a/sample.H b/sample.H index 55eb8e8..2bcb30e 100644 --- a/sample.H +++ b/sample.H @@ -105,7 +105,7 @@ public: return S; } // Renvoie le nombre de mots contenus dans S (pour la fct precision) - inline unsigned int nb_mots() const + inline unsigned long nb_mots() const { return S.size(); } diff --git a/sample.cpp b/sample.cpp index 04d790b..6d7ddfd 100644 --- a/sample.cpp +++ b/sample.cpp @@ -475,7 +475,7 @@ RESULT Sample::load (const char *Filename) break; default: - cerr << "Erreur non repertorie" << endl; + cerr << "Erreur non repertoriee" << endl; } } return e; diff --git a/test.cpp b/test.cpp index f593bfb..0413f3a 100644 --- a/test.cpp +++ b/test.cpp @@ -25,7 +25,7 @@ void test_PSe(void) { cout << "res = " << res << endl; for (q=PSe.begin() ; q != PSe.end() ; q++) { - cout << "P_" << q->first << "(\Se) = " << q-> second << endl; + cout << "P_" << q->first << "(\\Se) = " << q-> second << endl; } }