Commit ae21fe5d authored by DeAn_Wei's avatar DeAn_Wei
Browse files

Merge branch 'master' of deanwei:ansijing/prodata

parents 6384e62a 75b0a93a
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ void HandleExtendedDislocation(InArgs_t *inArgs)
    }

    for(i=0; i<seq.size(); i++){
        data[0][i] += 0.5*cubel;
        data[4][i] /= ((double)seq.size());
        data[5][i] /= ((double)seq.size());
        data[6][i] /= ((double)seq.size());
+2 −2
Original line number Diff line number Diff line
@@ -14,14 +14,14 @@ vector<string> GetFiles(const string &file)
{
    int     iPos;
    DIR     *dir;
    char    basePath[256];
    char    basePath[256], *getcwdReturn;

    struct dirent   *ptr;
    string          f(file), fdir, fname, dname, bpath;
    vector<string>  strs;
    
    memset(basePath, '\0', sizeof(basePath));
    getcwd(basePath, 999);
    getcwdReturn = getcwd(basePath, sizeof(basePath));
    bpath = basePath;

    iPos = f.find_last_of('/');