sstat 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f0ea54fb1319bd5702f17df6fc58c5ae6f67ddf
-  data.tar.gz: bf10d230f11b7bac1888d9eb77c661ed6c597ee1
+  metadata.gz: 84e0e83a5a7938320e490283d07ff2bf7039d980
+  data.tar.gz: 072d1a1b15b07feadfa0b4364fe5eb56f2da4ae8
 SHA512:
-  metadata.gz: 51fe68035f95e4ee76cff316190a74ba910a40b0586bfd1207055d238ab4c6ab3003a10723b5366f4dafc4a7f862562ee75275f70283a7a03895d144f63e89b2
-  data.tar.gz: dc192a0ce719ff00141f6578956aa12c619d7519548993665f8050b2e7defdc200120f20cc581a467d9d534e8c5f168553ab00512074ea824b7cedddc5581de2
+  metadata.gz: 4f81a5fda02ce1e2e12adf4b66dee88df6ae452daec9f3b37062c6353d112e02c8c3be3361e5f5b272068d8f94b3361ed2870408331cdb366e4ac6185d6fb361
+  data.tar.gz: 757041cda1d6ae40a790138792e8cab507b9d60d9edf8c5b6451c9b115f73503ddef08c255776254377893e82d84e396382f09465761dd53843b2bbb6796c644

data/ext/sstat/lib/survival/survival_kaplan_meier.h

@@ -12,6 +12,17 @@
  * @return CENS_UC_NUM structure
  */
  #define EXP 1e-12
+
+double max_time_point(double* time, int size) {
+	double max = 0;
+	for(int i = 0; i < size; i++) {
+		if(time[i] > max)
+			max = time[i];
+	}
+
+	return max;
+}
+
 int censored_uncensred_each_time_range(double* time, int* censored, int size,  struct CENS_UC_NUM** cens_ucens_number)
 {
 	int i, count_at, uncensored_num_at, censored_num_at;
@@ -32,7 +43,6 @@ int censored_uncensred_each_time_range(double* time, int* censored, int size,  s
 	}
 
 	qsort(time_censored_array, size, sizeof(struct point), &point_compare_x);
-	//print_points(time_censored_array, size);
 
 	/* count number of unique uncensored time point */
 	int count = 0;
@@ -194,7 +204,7 @@ int kaplan_meier(double* time, int* censored, int size, curve* KM_curve)
 /**
  * @brief extend the KM curve based on the last 3 points
  */
-int KM_3p_extrapolation(struct CENS_UC_NUM** cens_uc_num, struct CENS_UC_NUM ** updated_cens_uc_num, int sample_size)
+int KM_3p_extrapolation(struct CENS_UC_NUM** cens_uc_num, struct CENS_UC_NUM ** updated_cens_uc_num, int sample_size, double max_time_point)
 {
 	int mean_last_uncensored = 0;
 	int mean_last_censored = 0;
@@ -213,6 +223,7 @@ int KM_3p_extrapolation(struct CENS_UC_NUM** cens_uc_num, struct CENS_UC_NUM **
 	int extrapolation_size = 0;
 	int updated_cens_uc_num_size = 0;
 	int i;
+	int last_index = (*cens_uc_num)->size - 1;
 	int last_1_index = (*cens_uc_num)->size - 2;
 	int last_4_index = (*cens_uc_num)->size - 5;
 	int actual_updated_size = 0;
@@ -300,8 +311,6 @@ int KM_3p_extrapolation(struct CENS_UC_NUM** cens_uc_num, struct CENS_UC_NUM **
 		}
 	}
 
-	//printf("Actual size, number left: %i, %i %i, %i, \n", count, num_left, mean_last_uncensored, mean_last_censored);
-
 	actual_updated_size = (*cens_uc_num)->size + count;
 
 	check(alloc_CENS_UC_NUM(updated_cens_uc_num, actual_updated_size) == 0, "Failed in allocating CENS_UC_NUM structure");
@@ -314,6 +323,9 @@ int KM_3p_extrapolation(struct CENS_UC_NUM** cens_uc_num, struct CENS_UC_NUM **
 		(*updated_cens_uc_num)->time[i] = (*cens_uc_num)->time[i];
 	}
 
+	time_interval_mean = (max_time_point - (*cens_uc_num)->time[last_index]) / count;
+	printf("Time interval: %f \n", time_interval_mean);
+
 	for(i = (*cens_uc_num)->size; i < actual_updated_size; i++) {
 		(*updated_cens_uc_num)->time[i] = (*updated_cens_uc_num)->time[i-1] + time_interval_mean;
 		if(i == actual_updated_size -1) {
@@ -346,6 +358,7 @@ int kaplan_meier_3p_extrapolation(double* time, int* censored, int size, struct
 {
 	int proc_state = 0;
 	struct CENS_UC_NUM* cens_ucens_number;
+	double max_time = max_time_point(time, size);
 	proc_state = censored_uncensred_each_time_range(time, censored, size, &cens_ucens_number);
 	struct point* KM =  alloc_points(size);
 
@@ -353,7 +366,7 @@ int kaplan_meier_3p_extrapolation(double* time, int* censored, int size, struct
 	if(cens_ucens_number->size > 6)
 	{
 		struct CENS_UC_NUM* updated_cens_ucens_number;
-		proc_state = KM_3p_extrapolation(&cens_ucens_number, &updated_cens_ucens_number, size);
+		proc_state = KM_3p_extrapolation(&cens_ucens_number, &updated_cens_ucens_number, size, max_time);
 		calculate_kaplan_meier(size, updated_cens_ucens_number, &KM);
 		KM_curve->point_array = KM;
 		KM_curve->size = updated_cens_ucens_number->size;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sstat
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Haipeng Li
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-17 00:00:00.000000000 Z
+date: 2016-11-22 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: haipeng3@ualberta.ca