OSDN Git Service

make eosBayesInit
author久永浩司 <hisanagakouji@hisanagakouji-no-MacBook-Air.local>
Wed, 11 Nov 2015 09:54:56 +0000 (18:54 +0900)
committer久永浩司 <hisanagakouji@hisanagakouji-no-MacBook-Air.local>
Wed, 11 Nov 2015 09:54:56 +0000 (18:54 +0900)
20 files changed:
bin/wish/ctfDisplay/tclIndex
include/String.h
include/eosBayes.h
src/Objects/DataExpress/eosRuby/src/Swig/mkmf.log
src/Objects/General/eosBayes/doc/eosBayes.html [new file with mode: 0644]
src/Objects/General/eosBayes/inc/eosBayes.h
src/Objects/General/eosBayes/src/eosBayesCondition.c [new file with mode: 0644]
src/Objects/General/eosBayes/src/eosBayesCondition.c~ [new file with mode: 0644]
src/Objects/General/eosBayes/src/eosBayesDistributionInit.c [new file with mode: 0644]
src/Objects/General/eosBayes/src/eosBayesDistributionInit.c~ [new file with mode: 0644]
src/Objects/General/eosBayes/src/eosBayesDistributionInitialProbabilitySet.c [new file with mode: 0644]
src/Objects/General/eosBayes/src/eosBayesDistributionInitialProbabilitySet.c~ [new file with mode: 0644]
src/Objects/General/eosBayes/src/eosBayesWrite.c [new file with mode: 0644]
src/Objects/General/eosBayes/src/eosBayesWrite.c~ [new file with mode: 0644]
src/Objects/General/eosBayes/src/leosBayesInit.c [new file with mode: 0644]
src/Objects/General/eosBayes/src/leosBayesInit.c~ [new file with mode: 0644]
src/Tools/Makefile [changed from symlink to file mode: 0755]
src/Tools/eosBayes/eosBayesInit/src/eosBayesInit.c
src/Tools/eosBayes/eosBayesInit/src/test/Makefile
src/Tools/eosBayes/eosBayesInit/src/test/test.in [new file with mode: 0644]

index 1281333..7877a77 100644 (file)
@@ -34,7 +34,4 @@ set auto_index(::CTF2D::CTFInformationSet) [list source [file join $dir ctfDispl
 set auto_index(::CTF2D::CTFCalculation) [list source [file join $dir ctfDisplay.wish]]
 set auto_index(::CTF2D::ScatteringCalc) [list source [file join $dir ctfDisplay.wish]]
 set auto_index(::CTF2D::ctfInfoSave) [list source [file join $dir ctfDisplay.wish]]
-set auto_index(::CTF2D::ctfInfoSaveDefaultDir) [list source [file join $dir ctfDisplay.wish]]
-set auto_index(::CTF2D::ctfInfoSaveDefault) [list source [file join $dir ctfDisplay.wish]]
 set auto_index(::CTF2D::ctfInfoLoad) [list source [file join $dir ctfDisplay.wish]]
-set auto_index(::CTF2D::dummyFunc) [list source [file join $dir ctfDisplay.wish]]
index 7e5f053..2da0485 100644 (file)
@@ -1,6 +1,5 @@
 #ifndef STRING_H
 #define STRING_H
-
 #include <stdio.h>
 
 /* constant begin */
index 67682b5..adbc97d 100644 (file)
@@ -2,10 +2,12 @@
 #define EOS_BAYES_H
 
 typedef struct eosBayesDistribution {
+       //char* name;
        float min;
        float max;
        float delta;
        int   n;
+       float* value;
        float* prob;
 } eosBayesDistribution;
 
@@ -42,13 +44,15 @@ typedef struct eosBayesDistributionInfo {
 
 /* eosBayesInit.c */
 // Initialization of eosBays
-extern void eosBayesInit(eosBayes* b, int numDistribution, int numLikelihood, int mode);
+extern void leosBayesInit(eosBayes* b, int numDistribution, int numLikelihood, int mode);
+
+extern void eosBayesCondition(FILE* fptIn, eosBayes* d, eosBayesDistributionInfo* llinfo, int mode);
 
 // Initialize Each distribution of eosBayesDistributions
-extern void eosBayesDistributionInit(eosBayesDistributions* d, float min, float max, float delta, int mode);
+extern void eosBayesDistributionInit(eosBayesDistribution* d,eosBayesDistributionInfo* info, int mode);
 
 // Initialize probe of Each distribution of eosBayesDistriubutions
-extern void eosBayesDistributionInitialProbabilitySet(eosBayesDistribution* d, int mode);
+extern void eosBayesDistributionInitialProbabilitySet(eosBayesDistribution* d, eosBayesDistributionInfo* info, int mode);
 
 /* eosBayesEstimation.c */
 extern void eosBayesEstimation(eosBayesDistribution* d, int mode);
index 71b50a3..a44d564 100755 (executable)
@@ -1,36 +1,65 @@
 have_library: checking for main() in -lGL... -------------------- no
 
-"gcc -o conftest -I/Users/tacyas/Eos/util/X86MAC64/include/ruby-1.9.1/x86_64-darwin13.2.0 -I/Users/tacyas/Eos/util/X86MAC64/include/ruby-1.9.1/ruby/backward -I/Users/tacyas/Eos/util/X86MAC64/include/ruby-1.9.1 -I. -I/Users/tacyas/Eos/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE    -O3 -ggdb -Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-missing-field-initializers -Wshorten-64-to-32 -Wno-long-long  -pipe conftest.c  -L. -L/Users/tacyas/Eos/util/X86MAC64/lib -L/usr/lib -L/Users/tacyas/Eos/lib/X86MAC64 -L/Users/tacyas/Eos/util/X86MAC64/lib -L. -L/usr/local/lib     -lruby-static  -lpthread -ldl -lobjc "
-/Users/tacyas/Eos/util/X86MAC64/lib/ruby/1.9.1/mkmf.rb:305: warning: Insecure world writable dir /usr/local/cuda in PATH, mode 040777
+"xcrun clang -o conftest -I/System/Library/Frameworks/Ruby.framework/Versions/2.0/usr/include/ruby-2.0.0/universal-darwin14 -I/System/Library/Frameworks/Ruby.framework/Versions/2.0/usr/include/ruby-2.0.0/ruby/backward -I/System/Library/Frameworks/Ruby.framework/Versions/2.0/usr/include/ruby-2.0.0 -I. -I/Users/hisanagakouji/Eos/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT    -g -Os -pipe -DHAVE_GCC_SYNC_BUILTINS conftest.c  -L. -L/System/Library/Frameworks/Ruby.framework/Versions/2.0/usr/lib -L/usr/lib -L/Users/hisanagakouji/Eos/lib/X86MAC64 -L/Users/hisanagakouji/Eos/util/X86MAC64/lib -L. -L/usr/local/lib   -arch x86_64 -arch i386   -lruby.2.0.0  -lpthread -ldl -lobjc "
+/System/Library/Frameworks/Ruby.framework/Versions/2.0/usr/lib/ruby/2.0.0/mkmf.rb:373: warning: Insecure world writable dir /Developer/NVIDIA/CUDA-6.5/bin in PATH, mode 040777
 checked program was:
 /* begin */
 1: #include "ruby.h"
 2: 
-3: int main() {return 0;}
+3: int main(int argc, char **argv)
+4: {
+5:   return 0;
+6: }
 /* end */
 
-"gcc -o conftest -I/Users/tacyas/Eos/util/X86MAC64/include/ruby-1.9.1/x86_64-darwin13.2.0 -I/Users/tacyas/Eos/util/X86MAC64/include/ruby-1.9.1/ruby/backward -I/Users/tacyas/Eos/util/X86MAC64/include/ruby-1.9.1 -I. -I/Users/tacyas/Eos/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE    -O3 -ggdb -Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-missing-field-initializers -Wshorten-64-to-32 -Wno-long-long  -pipe conftest.c  -L. -L/Users/tacyas/Eos/util/X86MAC64/lib -L/usr/lib -L/Users/tacyas/Eos/lib/X86MAC64 -L/Users/tacyas/Eos/util/X86MAC64/lib -L. -L/usr/local/lib     -lruby-static -lGL  -lpthread -ldl -lobjc "
-ld: library not found for -lGL
-clang: error: linker command failed with exit code 1 (use -v to see invocation)
+"xcrun clang -o conftest -I/System/Library/Frameworks/Ruby.framework/Versions/2.0/usr/include/ruby-2.0.0/universal-darwin14 -I/System/Library/Frameworks/Ruby.framework/Versions/2.0/usr/include/ruby-2.0.0/ruby/backward -I/System/Library/Frameworks/Ruby.framework/Versions/2.0/usr/include/ruby-2.0.0 -I. -I/Users/hisanagakouji/Eos/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT    -g -Os -pipe -DHAVE_GCC_SYNC_BUILTINS conftest.c  -L. -L/System/Library/Frameworks/Ruby.framework/Versions/2.0/usr/lib -L/usr/lib -L/Users/hisanagakouji/Eos/lib/X86MAC64 -L/Users/hisanagakouji/Eos/util/X86MAC64/lib -L. -L/usr/local/lib   -arch x86_64 -arch i386   -lruby.2.0.0 -lGL  -lpthread -ldl -lobjc "
+conftest.c:5:57: error: use of undeclared identifier 'main'
+int t(void) { void ((*volatile p)()); p = (void ((*)()))main; return 0; }
+                                                        ^
+1 error generated.
 checked program was:
 /* begin */
-1: #include "ruby.h"
-2: 
-3: /*top*/
-4: int main() {return 0;}
-5: int t() { void ((*volatile p)()); p = (void ((*)()))main; return 0; }
+ 1: #include "ruby.h"
+ 2: 
+ 3: /*top*/
+ 4: extern int t(void);
+ 5: int t(void) { void ((*volatile p)()); p = (void ((*)()))main; return 0; }
+ 6: int main(int argc, char **argv)
+ 7: {
+ 8:   if (argc > 1000000) {
+ 9:     printf("%p", &t);
+10:   }
+11: 
+12:   return 0;
+13: }
 /* end */
 
-"gcc -o conftest -I/Users/tacyas/Eos/util/X86MAC64/include/ruby-1.9.1/x86_64-darwin13.2.0 -I/Users/tacyas/Eos/util/X86MAC64/include/ruby-1.9.1/ruby/backward -I/Users/tacyas/Eos/util/X86MAC64/include/ruby-1.9.1 -I. -I/Users/tacyas/Eos/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE    -O3 -ggdb -Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-missing-field-initializers -Wshorten-64-to-32 -Wno-long-long  -pipe conftest.c  -L. -L/Users/tacyas/Eos/util/X86MAC64/lib -L/usr/lib -L/Users/tacyas/Eos/lib/X86MAC64 -L/Users/tacyas/Eos/util/X86MAC64/lib -L. -L/usr/local/lib     -lruby-static -lGL  -lpthread -ldl -lobjc "
+"xcrun clang -o conftest -I/System/Library/Frameworks/Ruby.framework/Versions/2.0/usr/include/ruby-2.0.0/universal-darwin14 -I/System/Library/Frameworks/Ruby.framework/Versions/2.0/usr/include/ruby-2.0.0/ruby/backward -I/System/Library/Frameworks/Ruby.framework/Versions/2.0/usr/include/ruby-2.0.0 -I. -I/Users/hisanagakouji/Eos/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT    -g -Os -pipe -DHAVE_GCC_SYNC_BUILTINS conftest.c  -L. -L/System/Library/Frameworks/Ruby.framework/Versions/2.0/usr/lib -L/usr/lib -L/Users/hisanagakouji/Eos/lib/X86MAC64 -L/Users/hisanagakouji/Eos/util/X86MAC64/lib -L. -L/usr/local/lib   -arch x86_64 -arch i386   -lruby.2.0.0 -lGL  -lpthread -ldl -lobjc "
+conftest.c:5:15: warning: implicit declaration of function 'main' is invalid in C99 [-Wimplicit-function-declaration]
+int t(void) { main(); return 0; }
+              ^
+1 warning generated.
 ld: library not found for -lGL
+conftest.c:5:15: warning: implicit declaration of function 'main' is invalid in C99 [-Wimplicit-function-declaration]
+int t(void) { main(); return 0; }
+              ^
+1 warning generated.
 clang: error: linker command failed with exit code 1 (use -v to see invocation)
 checked program was:
 /* begin */
-1: #include "ruby.h"
-2: 
-3: /*top*/
-4: int main() {return 0;}
-5: int t() { main(); return 0; }
+ 1: #include "ruby.h"
+ 2: 
+ 3: /*top*/
+ 4: extern int t(void);
+ 5: int t(void) { main(); return 0; }
+ 6: int main(int argc, char **argv)
+ 7: {
+ 8:   if (argc > 1000000) {
+ 9:     printf("%p", &t);
+10:   }
+11: 
+12:   return 0;
+13: }
 /* end */
 
 --------------------
diff --git a/src/Objects/General/eosBayes/doc/eosBayes.html b/src/Objects/General/eosBayes/doc/eosBayes.html
new file mode 100644 (file)
index 0000000..84b4081
--- /dev/null
@@ -0,0 +1,89 @@
+<HR>
+<A NAME="Information">
+<H2>Information from source codes</H2>
+</A>
+<PRE>
+</PRE>
+<HR>
+<A NAME="include">
+<H2>eosBayes.h</H2>
+</A>
+<PRE>
+#ifndef EOS_BAYES_H
+#define EOS_BAYES_H
+
+typedef struct eosBayesDistribution {
+       //char* name;
+       float min;
+       float max;
+       float delta;
+       int   n;
+       float* value;
+       float* prob;
+} eosBayesDistribution;
+
+typedef struct eosBayes {
+       int numDistribution;
+       eosBayesDistribution* prior;
+       eosBayesDistribution* posterior;
+
+       int numLikelihood;
+       eosBayesDistribution* likelihood;
+} eosBayes;
+
+
+typedef enum eosBayesDistributionInfoMode {
+        eosBayesDistributionInfoModeGaussian=0
+
+}  eosBayesDistributionInfoMode; 
+
+typedef struct eosBayesDistributionInfo {
+       float min;
+       float max;
+       float delta;
+
+
+        eosBayesDistributionInfoMode mode;
+
+
+       // For Gaussian
+       float mean;
+       float sigma;
+} eosBayesDistributionInfo;
+
+
+/* eosBayesInit.c */
+// Initialization of eosBays
+extern void leosBayesInit(eosBayes* b, int numDistribution, int numLikelihood, int mode);
+
+extern void eosBayesCondition(FILE* fptIn, eosBayes* d, eosBayesDistributionInfo* llinfo, int mode);
+
+// Initialize Each distribution of eosBayesDistributions
+extern void eosBayesDistributionInit(eosBayesDistribution* d,eosBayesDistributionInfo* info, int mode);
+
+// Initialize probe of Each distribution of eosBayesDistriubutions
+extern void eosBayesDistributionInitialProbabilitySet(eosBayesDistribution* d, eosBayesDistributionInfo* info, int mode);
+
+/* eosBayesEstimation.c */
+extern void eosBayesEstimation(eosBayesDistribution* d, int mode);
+
+/* eosBayesWrite.c */
+extern void eosBayesDistribututionWrite(FILE* fpt, eosBayesDistribution* d, int mode);
+extern void eosBayesPriorWrite(FILE* fpt, eosBayes* d, int mode);
+extern void eosBayesPosterior(FILE* fpt, eosBayes* d, int mode);
+extern void eosBayesLikelihood(FILE* fpt, eosBayes* d, int mode);
+extern void eosBayesWrite(FILE* fpt, eosBayes* d, int mode);
+// FileFormat
+// 0 min0 max0 delta0 n0 out.prior[0].prob[0] ...... prob[n-1]
+// 1 min1 max1 delta1 n1 out.prior[1].prob[0] ...... prob[n-1]
+
+
+
+/* eosBayesRead.c */
+extern void eosBayesDistributionRead(FILE* fpt, eosBayesDistribution* d, int mode);
+extern void eosBayesRead(FILE* fpt, eosBayes* d, int mode);
+
+
+#endif /* EOS_BAYES_H */
+</PRE>
index 67682b5..adbc97d 100644 (file)
@@ -2,10 +2,12 @@
 #define EOS_BAYES_H
 
 typedef struct eosBayesDistribution {
+       //char* name;
        float min;
        float max;
        float delta;
        int   n;
+       float* value;
        float* prob;
 } eosBayesDistribution;
 
@@ -42,13 +44,15 @@ typedef struct eosBayesDistributionInfo {
 
 /* eosBayesInit.c */
 // Initialization of eosBays
-extern void eosBayesInit(eosBayes* b, int numDistribution, int numLikelihood, int mode);
+extern void leosBayesInit(eosBayes* b, int numDistribution, int numLikelihood, int mode);
+
+extern void eosBayesCondition(FILE* fptIn, eosBayes* d, eosBayesDistributionInfo* llinfo, int mode);
 
 // Initialize Each distribution of eosBayesDistributions
-extern void eosBayesDistributionInit(eosBayesDistributions* d, float min, float max, float delta, int mode);
+extern void eosBayesDistributionInit(eosBayesDistribution* d,eosBayesDistributionInfo* info, int mode);
 
 // Initialize probe of Each distribution of eosBayesDistriubutions
-extern void eosBayesDistributionInitialProbabilitySet(eosBayesDistribution* d, int mode);
+extern void eosBayesDistributionInitialProbabilitySet(eosBayesDistribution* d, eosBayesDistributionInfo* info, int mode);
 
 /* eosBayesEstimation.c */
 extern void eosBayesEstimation(eosBayesDistribution* d, int mode);
diff --git a/src/Objects/General/eosBayes/src/eosBayesCondition.c b/src/Objects/General/eosBayes/src/eosBayesCondition.c
new file mode 100644 (file)
index 0000000..b9b191e
--- /dev/null
@@ -0,0 +1,51 @@
+/*
+# %M% %Y% %I%
+# The latest update : %G% at %U%
+#
+#%Z% eosBayesCondition ver %I%
+#%Z% Created by 
+#%Z%
+#%Z% Usage : eosBayesCondition 
+#%Z% Attention
+#%Z%
+*/
+static char __sccs_id[] = "%Z%eosBayesCondition ver%I%; Date:%D% %Z%";
+
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include "../inc/eosBayes.h"
+
+#define DEBUG
+#include "genUtil.h"
+#include "String.h"
+
+void eosBayesCondition(FILE* fptIn, eosBayes* d, eosBayesDistributionInfo* llinfo, int mode){
+
+       int i;
+       char s[1024];
+       
+       DEBUGPRINT("File read start\n");
+       for(i=0; i<d->numDistribution;i++){
+               // read each of min, max, delta, mode, mean, sigma
+
+               DEBUGPRINT2("%d/%d loop\n",i+1,d->numDistribution);
+               stringGetFromFile(s, "in main", fptIn, stdout, 3);
+
+               llinfo->min      = stringGetNthRealData(s, 2," \t");
+               llinfo->max      = stringGetNthRealData(s, 3," \t");
+               llinfo->delta    = stringGetNthRealData(s, 4," \t");
+               llinfo->mode     = stringGetNthIntegerData(s, 5," \t");
+
+               llinfo->mean     = stringGetNthRealData(s, 6," \t");
+               llinfo->sigma    = stringGetNthRealData(s, 7," \t");
+
+               DEBUGPRINT1("%s\n",s);
+               DEBUGPRINT6("%f %f %f %u %f %f\n",llinfo->min,llinfo->max,llinfo->delta,llinfo->mode,llinfo->mean,llinfo->sigma);
+               eosBayesDistributionInit(&(d->prior[i]),llinfo,0);
+               eosBayesDistributionInitialProbabilitySet(&(d->prior[i]), llinfo, 0);
+       }
+       DEBUGPRINT("eosBayesConditon finish\n")
+
+}
diff --git a/src/Objects/General/eosBayes/src/eosBayesCondition.c~ b/src/Objects/General/eosBayes/src/eosBayesCondition.c~
new file mode 100644 (file)
index 0000000..fc6b8e9
--- /dev/null
@@ -0,0 +1,51 @@
+/*
+# %M% %Y% %I%
+# The latest update : %G% at %U%
+#
+#%Z% eosBayesCondition ver %I%
+#%Z% Created by 
+#%Z%
+#%Z% Usage : eosBayesCondition 
+#%Z% Attention
+#%Z%
+*/
+static char __sccs_id[] = "%Z%eosBayesCondition ver%I%; Date:%D% %Z%";
+
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include "../inc/eosBayes.h"
+
+#define DEBUG
+#include "genUtil.h"
+#include "String.h"
+
+void eosBayesCondition(FILE* fptIn, eosBayes* d, eosBayesDistributionInfo* llinfo, int mode){
+
+       int i;
+       char s[1024];
+       
+       DEBUGPRINT("File read start\n");
+       for(i=0; i<d->numDistribution;i++){
+               // read each of min, max, delta, mode, mean, sigma
+
+               DEBUGPRINT2("%d/%d loop\n",i+1,d->numDistribution);
+               stringGetFromFile(s, "in main", fptIn, stdout, 3);
+
+               llinfo->min      = stringGetNthRealData(s, 2," \t");
+               llinfo->max      = stringGetNthRealData(s, 3," \t");
+               llinfo->delta    = stringGetNthRealData(s, 4," \t");
+               llinfo->mode     = stringGetNthIntegerData(s, 5," \t");
+
+               llinfo->mean     = stringGetNthRealData(s, 6," \t");
+               llinfo->sigma    = stringGetNthRealData(s, 7," \t");
+
+               DEBUGPRINT("%s\n");
+               DEBUGPRINT6("%f %f %f %u %f %f\n",llinfo->min,llinfo->max,llinfo->delta,llinfo->mode,llinfo->mean,llinfo->sigma);
+               eosBayesDistributionInit(&(d->prior[i]),llinfo,0);
+               eosBayesDistributionInitialProbabilitySet(&(d->prior[i]), llinfo, 0);
+       }
+       DEBUGPRINT("eosBayesConditon finish\n")
+
+}
diff --git a/src/Objects/General/eosBayes/src/eosBayesDistributionInit.c b/src/Objects/General/eosBayes/src/eosBayesDistributionInit.c
new file mode 100644 (file)
index 0000000..b0a9dc3
--- /dev/null
@@ -0,0 +1,42 @@
+/*
+# %M% %Y% %I%
+# The latest update : %G% at %U%
+#
+#%Z% eosBayesDistributionInit ver %I%
+#%Z% Created by 
+#%Z%
+#%Z% Usage : eosBayesDistributionInit 
+#%Z% Attention
+#%Z%
+*/
+static char __sccs_id[] = "%Z%eosBayesDistributionInit ver%I%; Date:%D% %Z%";
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include "../inc/eosBayes.h"
+
+
+
+void eosBayesDistributionInit(eosBayesDistribution* d, eosBayesDistributionInfo* info, int mode){
+
+       int i;
+       
+       d->min   = info->min;
+       d->max   = info->max;
+       d->delta = info->delta;
+       d->n     = (int)(((info->max-info->min)/info->delta)+0.5);
+
+       d->value = (float*)malloc(sizeof(float)*d->n);
+       d->prob  = (float*)malloc(sizeof(float)*d->n);
+
+       for(i=0;i<d->n;i++){
+               d->value[i] = d->min+(d->delta*i);
+       }
+
+       if(mode==0){
+               info->mode = eosBayesDistributionInfoModeGaussian;
+       }
+
+       
+}
diff --git a/src/Objects/General/eosBayes/src/eosBayesDistributionInit.c~ b/src/Objects/General/eosBayes/src/eosBayesDistributionInit.c~
new file mode 100644 (file)
index 0000000..d2fc276
--- /dev/null
@@ -0,0 +1,14 @@
+/*
+# %M% %Y% %I%
+# The latest update : %G% at %U%
+#
+#%Z% eosBayesDistributionInit ver %I%
+#%Z% Created by 
+#%Z%
+#%Z% Usage : eosBayesDistributionInit 
+#%Z% Attention
+#%Z%
+*/
+static char __sccs_id[] = "%Z%eosBayesDistributionInit ver%I%; Date:%D% %Z%";
+
+
diff --git a/src/Objects/General/eosBayes/src/eosBayesDistributionInitialProbabilitySet.c b/src/Objects/General/eosBayes/src/eosBayesDistributionInitialProbabilitySet.c
new file mode 100644 (file)
index 0000000..77b4f8c
--- /dev/null
@@ -0,0 +1,41 @@
+/*
+# %M% %Y% %I%
+# The latest update : %G% at %U%
+#
+#%Z% eosBayesDistributionInitialProbabilitySet ver %I%
+#%Z% Created by 
+#%Z%
+#%Z% Usage : eosBayesDistributionInitialProbabilitySet 
+#%Z% Attention
+#%Z%
+*/
+static char __sccs_id[] = "%Z%eosBayesDistributionInitialProbabilitySet ver%I%; Date:%D% %Z%";
+
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <math.h>
+#include "../inc/eosBayes.h"
+
+
+void eosBayesDistributionInitialProbabilitySet(eosBayesDistribution* d, eosBayesDistributionInfo* info, int mode){
+
+       int i;
+       float data;
+
+       switch(info->mode){
+
+               case eosBayesDistributionInfoModeGaussian:
+                       fprintf(stderr, "-----Mode Gaussian distribution-----\n");
+                       for(i=0;i<d->n;i++){
+                               data       = info->min + (info->delta*i);
+                               d->prob[i] = (1/sqrt(2*M_PI*info->sigma*info->sigma))*exp(-(((data-info->mean)*(data-info->mean))/(2*info->sigma*info->sigma)));
+                       }
+                       break;
+
+               default:
+                       break;
+
+       }
+}
diff --git a/src/Objects/General/eosBayes/src/eosBayesDistributionInitialProbabilitySet.c~ b/src/Objects/General/eosBayes/src/eosBayesDistributionInitialProbabilitySet.c~
new file mode 100644 (file)
index 0000000..875ef5a
--- /dev/null
@@ -0,0 +1,14 @@
+/*
+# %M% %Y% %I%
+# The latest update : %G% at %U%
+#
+#%Z% eosBayesDistributionInitialProbabilitySet ver %I%
+#%Z% Created by 
+#%Z%
+#%Z% Usage : eosBayesDistributionInitialProbabilitySet 
+#%Z% Attention
+#%Z%
+*/
+static char __sccs_id[] = "%Z%eosBayesDistributionInitialProbabilitySet ver%I%; Date:%D% %Z%";
+
+
diff --git a/src/Objects/General/eosBayes/src/eosBayesWrite.c b/src/Objects/General/eosBayes/src/eosBayesWrite.c
new file mode 100644 (file)
index 0000000..9967dd9
--- /dev/null
@@ -0,0 +1,85 @@
+/*
+# %M% %Y% %I%
+# The latest update : %G% at %U%
+#
+#%Z% eosBayesWrite ver %I%
+#%Z% Created by 
+#%Z%
+#%Z% Usage : eosBayesWrite 
+#%Z% Attention
+#%Z%
+*/
+static char __sccs_id[] = "%Z%eosBayesWrite ver%I%; Date:%D% %Z%";
+
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include "../inc/eosBayes.h"
+
+
+void eosBayesDistributionWrite(FILE* fpt, eosBayesDistribution* d, int mode){
+
+       int i;
+       
+       switch(mode){
+       
+               case 1:
+                               fprintf(fpt,"#dist: %f\t%f\t%f\t%d\n",d->min,d->max,d->delta,d->n);
+                               for(i=0;i<d->n;i++){
+                                       fprintf(fpt,"%f\n",d->prob[i]);
+                               }
+                               fprintf(fpt,"\n");
+
+                               break;
+               case 2:
+                               break;
+
+               default:
+                               fprintf(stderr,"");
+                               break;
+
+       }
+
+}
+
+
+void eosBayesPriorWrite(FILE* fpt, eosBayes* d, int mode){
+
+       int i;
+
+       for(i=0;i<d->numDistribution;i++){
+               eosBayesDistributionWrite(fpt,&(d->prior[i]),1);
+       }
+
+
+}
+
+void eosBayesPosteriorWrite(FILE* fpt, eosBayes* d, int mode){
+
+       int i;
+
+       for(i=0;i<d->numDistribution;i++){
+               eosBayesDistributionWrite(fpt,&(d->posterior[i]),1);
+       }
+
+
+}
+
+
+
+void eosBayesLikelihoodWrite(FILE* fpt, eosBayes* d, int mode){
+
+       int i;
+
+       for(i=0;d->numLikelihood;i++){
+               eosBayesDistributionWrite(fpt,&(d->likelihood[i]),2);
+       }
+
+
+}
+
+
+
+void eosBayesWrite(FILE* fpt, eosBayes* d, int mode){
+}
diff --git a/src/Objects/General/eosBayes/src/eosBayesWrite.c~ b/src/Objects/General/eosBayes/src/eosBayesWrite.c~
new file mode 100644 (file)
index 0000000..59d2986
--- /dev/null
@@ -0,0 +1,85 @@
+/*
+# %M% %Y% %I%
+# The latest update : %G% at %U%
+#
+#%Z% eosBayesWrite ver %I%
+#%Z% Created by 
+#%Z%
+#%Z% Usage : eosBayesWrite 
+#%Z% Attention
+#%Z%
+*/
+static char __sccs_id[] = "%Z%eosBayesWrite ver%I%; Date:%D% %Z%";
+
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include "../inc/eosBayes.h"
+
+
+void eosBayesDistributionWrite(FILE* fpt, eosBayesDistribution* d, int mode){
+
+       int i;
+       
+       switch(mode){
+       
+               case 1:
+                               fprintf(fpt,"dist: %f\t%f\t%f\t%d\n",d->min,d->max,d->delta,d->n);
+                               for(i=0;i<d->n;i++){
+                                       fprintf(fpt,"%f\n",d->prob[i]);
+                               }
+                               fprintf(fpt,"\n");
+
+                               break;
+               case 2:
+                               break;
+
+               default:
+                               fprintf(stderr,"");
+                               break;
+
+       }
+
+}
+
+
+void eosBayesPriorWrite(FILE* fpt, eosBayes* d, int mode){
+
+       int i;
+
+       for(i=0;i<d->numDistribution;i++){
+               eosBayesDistributionWrite(fpt,&(d->prior[i]),1);
+       }
+
+
+}
+
+void eosBayesPosteriorWrite(FILE* fpt, eosBayes* d, int mode){
+
+       int i;
+
+       for(i=0;i<d->numDistribution;i++){
+               eosBayesDistributionWrite(fpt,&(d->posterior[i]),1);
+       }
+
+
+}
+
+
+
+void eosBayesLikelihoodWrite(FILE* fpt, eosBayes* d, int mode){
+
+       int i;
+
+       for(i=0;d->numLikelihood;i++){
+               eosBayesDistributionWrite(fpt,&(d->likelihood[i]),2);
+       }
+
+
+}
+
+
+
+void eosBayesWrite(FILE* fpt, eosBayes* d, int mode){
+}
diff --git a/src/Objects/General/eosBayes/src/leosBayesInit.c b/src/Objects/General/eosBayes/src/leosBayesInit.c
new file mode 100644 (file)
index 0000000..2538fed
--- /dev/null
@@ -0,0 +1,31 @@
+/*
+# %M% %Y% %I%
+# The latest update : %G% at %U%
+#
+#%Z% leosBayesInit ver %I%
+#%Z% Created by 
+#%Z%
+#%Z% Usage : leosBayesInit 
+#%Z% Attention
+#%Z%
+*/
+static char __sccs_id[] = "%Z%leosBayesInit ver%I%; Date:%D% %Z%";
+
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include "../inc/eosBayes.h"
+
+
+void leosBayesInit(eosBayes* b, int numDistribution, int numLikelihood, int mode){
+       
+       b->numDistribution = numDistribution;
+       b->numLikelihood   = numLikelihood;
+
+       b->prior = (eosBayesDistribution*)malloc(sizeof(eosBayesDistribution)*numDistribution);
+       b->posterior = (eosBayesDistribution*)malloc(sizeof(eosBayesDistribution)*numDistribution);
+
+       b->likelihood = (eosBayesDistribution*)malloc(sizeof(eosBayesDistribution)*numLikelihood); 
+
+}
diff --git a/src/Objects/General/eosBayes/src/leosBayesInit.c~ b/src/Objects/General/eosBayes/src/leosBayesInit.c~
new file mode 100644 (file)
index 0000000..3b9925d
--- /dev/null
@@ -0,0 +1,28 @@
+/*
+# %M% %Y% %I%
+# The latest update : %G% at %U%
+#
+#%Z% leosBayesInit ver %I%
+#%Z% Created by 
+#%Z%
+#%Z% Usage : leosBayesInit 
+#%Z% Attention
+#%Z%
+*/
+static char __sccs_id[] = "%Z%leosBayesInit ver%I%; Date:%D% %Z%";
+
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include "../inc/eosBayes.h"
+
+
+void leosBayesInit(eosBayes* b, int numDistribution, int numLikelihood, int mode){
+
+       b->prior = (eosBayesDistribution*)malloc(sizeof(eosBayesDistribution)*numDistribution);
+       b->posterior = (eosBayesDistribution*)malloc(sizeof(eosBayesDistribution)*numDistribution);
+
+       b->likelihood = (eosBayesDistribution*)malloc(sizeof(eosBayesDistribution)*numLikelihood); 
+
+}
deleted file mode 120000 (symlink)
index 80a2401a7dc3d8e1cdc121c22208bd28b6887cf3..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1 +0,0 @@
-/Users/tacyas/Eos/src/Config/Template/ToolsHomeTemplate.Dir/Makefile
\ No newline at end of file
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..ad841104b1b4aa83ce554496adb2d2476544f988
--- /dev/null
@@ -0,0 +1,5 @@
+include ../Config/Define.inc
+include Config/Define.inc
+include .Source
+
+include Config/Target.inc
index 1da865b..4ffa918 100755 (executable)
@@ -39,8 +39,7 @@ main(int argc, char* argv[])
        eosBayes out;
        eosBayesInitInfo info;
        eosBayesDistributionInfo llinfo;
-       int i;
-       char s[1024];
+
        
        init0(&info);
     argCheck(&info, argc, argv);
@@ -48,28 +47,21 @@ main(int argc, char* argv[])
 
        DEBUGPRINT("Program Start\n");
 
-       eosBayesInit(&out, info.numDistribution, info.numLikelihood, info.mode);
+       leosBayesInit(&out, info.numDistribution, info.numLikelihood, info.mode);
 
        // input: info.fptIn  
        // 0 min0 max0 delta0 mode0 mean0 sigma0
-       // ... 
-       for(i=0; i<info.numDistribution; i++) {
-               // read each of min, max, delta, mode, mean, sigma
+       // ...
 
-               stringGetFromFile(s, "in main", info.fptIn, stdout, 0);
-               llinfo.min = stringGetNthRealData(s, 2, " \t");
-               llinfo.max = stringGetNthReadData(s, 3, " \t");
-               //llinfo.delta = delta;
-               llinfo.mode  = stringGetNthIntegerData(s, 5, " \t");
-               //llinfo.mean = mean;
-               //llinfo.sigma = sigma;
-               eosBayesDistributionInit(&(out.prior[i]), &llinfo, info.mode) 
-               eosBayesDistributionInitialProbabilitySet(eosBayesDistribution* d, &llinfo, info.mode);
-       }
 
-       eosBayesPriorWrite(info.Out, &out, info.mode); 
+       eosBayesCondition(info.fptIn, &out, &llinfo, 0);
 
+       
+       eosBayesPriorWrite(info.fptOut, &out, info.mode); 
+       DEBUGPRINT("PriorWrite finish\n");
+       
        exit(EXIT_SUCCESS);
+
 }
 
 void
index 323c2db..5cec62d 100755 (executable)
@@ -11,7 +11,7 @@ help:
 
 exec:
        @echo "----- Execution Check -----"
-       ../$(OSTYPE)/$(OBJECTNAME) 
+       ../$(OSTYPE)/$(OBJECTNAME) -i data/test.in -o data/test.out2 -n 3 3
        @echo "----- Calc check -----"          
 
 clean:
diff --git a/src/Tools/eosBayes/eosBayesInit/src/test/test.in b/src/Tools/eosBayes/eosBayesInit/src/test/test.in
new file mode 100644 (file)
index 0000000..522f1a3
--- /dev/null
@@ -0,0 +1,2 @@
+0 0 360 2 0 15 10
+1 0 360 2 0 180 60
\ No newline at end of file