Pushed changes from the master version, phase 2, updated copyright

duxingmoyu · Jul 17, 2014 · 665869e · 665869e
1 parent 614a3f7
commit 665869e
Show file tree

Hide file tree

Showing 13 changed files with 450 additions and 145 deletions.
diff --git a/FitBit.cpp b/FitBit.cpp
@@ -1,6 +1,6 @@
 /*
  
- Copyright (c) 2012, Michael (Mikhail) Yudelson
+ Copyright (c) 2012-2014, Michael (Mikhail) Yudelson
  All rights reserved.
  
  Redistribution and use in source and binary forms, with or without
@@ -302,7 +302,8 @@ void FitBit::add(enum FIT_BIT_SLOT sourse_fbs, enum FIT_BIT_SLOT target_fbs) {
     add(soursePI, sourseA, sourseB, targetPI, targetA, targetB);
 }
 
-bool FitBit::checkConvergence() {
+bool FitBit::checkConvergence(FitResult *fr) {
+
 	NUMBER critetion = 0;
 	for(NPAR i=0; i<this->nS; i++)
 	{
@@ -315,6 +316,8 @@ bool FitBit::checkConvergence() {
 		}
 	}
 	return sqrt(critetion) < this->tol; // double the truth or false
+
+//    return (fr->pOmid - fr->pO) < this->tol;
 }
 
 void FitBit::doLog10ScaleGentle(enum FIT_BIT_SLOT fbs) {

diff --git a/FitBit.h b/FitBit.h
@@ -1,6 +1,6 @@
 /*
  
- Copyright (c) 2012, Michael (Mikhail) Yudelson
+ Copyright (c) 2012-2014, Michael (Mikhail) Yudelson
  All rights reserved.
  
  Redistribution and use in source and binary forms, with or without
@@ -84,7 +84,7 @@ class FitBit {
     void destroy(enum FIT_BIT_SLOT fbs);
     void copy(enum FIT_BIT_SLOT sourse_fbs, enum FIT_BIT_SLOT target_fbs);
     void add(enum FIT_BIT_SLOT sourse_fbs, enum FIT_BIT_SLOT target_fbs);
-    bool checkConvergence();
+    bool checkConvergence(FitResult *fr);
     void doLog10ScaleGentle(enum FIT_BIT_SLOT fbs);
 private:
     NUMBER tol;

diff --git a/HMMProblem.cpp b/HMMProblem.cpp
@@ -1,6 +1,6 @@
 /*
  
- Copyright (c) 2012, Michael (Mikhail) Yudelson
+ Copyright (c) 2012-2014, Michael (Mikhail) Yudelson
  All rights reserved.
  
  Redistribution and use in source and binary forms, with or without

diff --git a/HMMProblem.h b/HMMProblem.h
@@ -1,6 +1,6 @@
 /*
  
- Copyright (c) 2012, Michael (Mikhail) Yudelson
+ Copyright (c) 2012-2014, Michael (Mikhail) Yudelson
  All rights reserved.
  
  Redistribution and use in source and binary forms, with or without

diff --git a/InputUtil.cpp b/InputUtil.cpp
@@ -1,6 +1,6 @@
 /*
  
- Copyright (c) 2012, Michael (Mikhail) Yudelson
+ Copyright (c) 2012-2014, Michael (Mikhail) Yudelson
  All rights reserved.
  
  Redistribution and use in source and binary forms, with or without

diff --git a/InputUtil.h b/InputUtil.h
@@ -1,6 +1,6 @@
 /*
  
- Copyright (c) 2012, Michael (Mikhail) Yudelson
+ Copyright (c) 2012-2014, Michael (Mikhail) Yudelson
  All rights reserved.
  
  Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
 #include "utils.h"
 
 //#define bin_input_file_verstion 1
-#define bin_input_file_verstion 2 // increase number of skills students to 4 bytes
+#define bin_input_file_verstion 2 // increase number of skills/students to a 4 byte integer
 
 class InputUtil {
 public:

diff --git a/StripedArray.cpp b/StripedArray.cpp
@@ -1,6 +1,6 @@
 /*
  
- Copyright (c) 2012, Michael (Mikhail) Yudelson
+ Copyright (c) 2012-2014, Michael (Mikhail) Yudelson
  All rights reserved.
  
  Redistribution and use in source and binary forms, with or without

diff --git a/StripedArray.h b/StripedArray.h
@@ -1,6 +1,6 @@
 /*
  
- Copyright (c) 2012, Michael (Mikhail) Yudelson
+ Copyright (c) 2012-2014, Michael (Mikhail) Yudelson
  All rights reserved.
  
  Redistribution and use in source and binary forms, with or without

diff --git a/inputconvert.cpp b/inputconvert.cpp
@@ -1,6 +1,6 @@
 /*
  
- Copyright (c) 2012, Michael (Mikhail) Yudelson
+ Copyright (c) 2012-2014, Michael (Mikhail) Yudelson
  All rights reserved.
  
  Redistribution and use in source and binary forms, with or without

diff --git a/predicthmm.cpp b/predicthmm.cpp
@@ -1,6 +1,6 @@
 /*
  
- Copyright (c) 2012, Michael (Mikhail) Yudelson
+ Copyright (c) 2012-2014, Michael (Mikhail) Yudelson
  All rights reserved.
  
  Redistribution and use in source and binary forms, with or without
@@ -110,14 +110,13 @@ int main (int argc, char ** argv) {
 //    predict(predict_file, hmm);
 	if(param.quiet == 0)
 		printf("predicting is done in %8.6f seconds\n",(NUMBER)(clock()-tm)/CLOCKS_PER_SEC);
-    // THERE IS NO METRICS, WE PREDICT UNKNOWN, however, if we force prediction of all we do
-//    if( param.predictions>0 ) {
+    //if( param.predictions>0 ) {
         printf("trained model LL=%15.7f (%15.7f), AIC=%8.6f, BIC=%8.6f, RMSE=%8.6f (%8.6f), Acc=%8.6f (%8.6f)\n",
                metrics[0], metrics[1], // ll's
                2*hmm->getNparams() + 2*metrics[0], hmm->getNparams()*safelog(param.N) + 2*metrics[0],
                metrics[2], metrics[3], // rmse's
                metrics[4], metrics[5]); // acc's
-//    }
+    //}
     free(metrics);
 
 	destroy_input_data(&param);