From: Koji HISANAGA <hisanaga0824@cs04.lan.yasunaga-lab.bio.kyutech.ac.jp>
Date: Thu, 29 Dec 2016 14:59:16 +0000 (+0900)
Subject: modified eosBayesCondition
X-Git-Tag: v2.3.65p0294~46
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c879ed85ee90ac435ec79b85bffc433c3746ba40;p=eos%2Fbase.git

modified eosBayesCondition
---

diff --git a/include/eosBayes.h b/include/eosBayes.h
index bfb3637e72..07977701df 100644
--- a/include/eosBayes.h
+++ b/include/eosBayes.h
@@ -26,17 +26,19 @@ typedef struct eosBayes {
 
 
 typedef enum eosBayesDistributionInfoMode {
-	 eosBayesDistributionInfoModeGaussian=0
+	 eosBayesDistributionInfoModeGaussian=0,
+	 eosBayesDistributionInfoModeConstant=1
 } eosBayesDistributionInfoMode;
 
 typedef struct eosBayesDistributionInfo {
-	float min;
-	float max;
-	float delta;
-	eosBayesDistributionInfoMode mode;
-	// For Gaussian
-	float mean;
-	float sigma;
+  float min;
+  float max;
+  float delta;
+  eosBayesDistributionInfoMode mode;
+  // For Gaussian
+  float mean;
+  float sigma;
+  float constant;
 } eosBayesDistributionInfo;
 
 
@@ -45,6 +47,7 @@ typedef struct eosBayesDistributionInfo {
 extern void leosBayesInit(eosBayes* d, int numDistribution, int numLikelihood, int mode);
 
 extern void eosBayesCondition(FILE* fptIn, eosBayes* d, eosBayesDistributionInfo* llinfo, int mode);
+extern void eosBayesRefinementCondition(eosBayes* d, eosBayesDistributionInfo* llinfo, int n, int mode);
 
 // Initialize Each distribution of eosBayesDistributions
 extern void eosBayesDistributionInit(eosBayesDistribution* d,eosBayesDistributionInfo* info, int mode);
diff --git a/src/Objects/General/eosBayes/src/eosBayesCondition.c b/src/Objects/General/eosBayes/src/eosBayesCondition.c
index 34ef006420..4569fdba78 100644
--- a/src/Objects/General/eosBayes/src/eosBayesCondition.c
+++ b/src/Objects/General/eosBayes/src/eosBayesCondition.c
@@ -75,7 +75,7 @@ void eosBayesRefinementCondition(eosBayes* d, eosBayesDistributionInfo* llinfo,
 	case 0:
 	  /*Gaussian*/
 	  llinfo->min = d->posterior[i].valueofmaxposterior-d->posterior[i].delta;
-	  llinfo->min = d->posterior[i].valueofmaxposterior+d->posterior[i].delta;
+	  llinfo->max = d->posterior[i].valueofmaxposterior+d->posterior[i].delta;
 	  llinfo->sigma = d->posterior[i].delta;
 	  llinfo->mean = d->posterior[i].valueofmaxposterior;
 	  llinfo->delta = d->posterior[i].delta/n;