Changeset 3602 in Sophya

Timestamp:

Apr 28, 2009, 5:24:15 PM (16 years ago)

Author:

cmv

Message:

RandomGeneratorInterface + dSFMT etc..., cmv 28/04/2009

Location:

trunk/SophyaLib/BaseTools

Files:

• Makefile (modified) (4 diffs)
• basetools.h (modified) (1 diff)
• dSFMT-params.h (added)
• dSFMT-params11213.h (added)
• dSFMT-params1279.h (added)
• dSFMT-params132049.h (added)
• dSFMT-params19937.h (added)
• dSFMT-params216091.h (added)
• dSFMT-params2203.h (added)
• dSFMT-params4253.h (added)
• dSFMT-params44497.h (added)
• dSFMT-params521.h (added)
• dSFMT-params86243.h (added)
• dSFMT.c (added)
• dSFMT.h (added)
• dsfmtflags.h (added)
• objlist.list (modified) (2 diffs)
• randfmt.cc (added)
• randfmt.h (added)
• randinterf.cc (added)
• randinterf.h (added)
• randr48.cc (added)
• randr48.h (added)
• smakefile (modified) (4 diffs)
• sophyainit.cc (modified) (2 diffs)

trunk/SophyaLib/BaseTools/Makefile

@@ -4 +4 @@
  
 clean:
-         rm -f $(SOPHYAOBJP)datatype.o $(SOPHYAOBJP)dvlist.o $(SOPHYAOBJP)fiondblock.o $(SOPHYAOBJP)mutyv.o $(SOPHYAOBJP)ndatablock.o $(SOPHYAOBJP)pexceptions.o $(SOPHYAOBJP)ppersist.o $(SOPHYAOBJP)ppfbinstream.o $(SOPHYAOBJP)ppftpointerio.o $(SOPHYAOBJP)rawstream.o $(SOPHYAOBJP)sophyainit.o $(SOPHYAOBJP)stsrand.o $(SOPHYAOBJP)timestamp.o $(SOPHYAOBJP)gnumd5.o $(SOPHYAOBJP)srandgen.o
+         rm -f $(SOPHYAOBJP)datatype.o $(SOPHYAOBJP)dvlist.o $(SOPHYAOBJP)fiondblock.o $(SOPHYAOBJP)mutyv.o $(SOPHYAOBJP)ndatablock.o $(SOPHYAOBJP)pexceptions.o $(SOPHYAOBJP)ppersist.o $(SOPHYAOBJP)ppfbinstream.o $(SOPHYAOBJP)ppftpointerio.o $(SOPHYAOBJP)randfmt.o $(SOPHYAOBJP)randinterf.o $(SOPHYAOBJP)randr48.o $(SOPHYAOBJP)rawstream.o $(SOPHYAOBJP)sophyainit.o $(SOPHYAOBJP)stsrand.o $(SOPHYAOBJP)timestamp.o $(SOPHYAOBJP)dSFMT.o $(SOPHYAOBJP)gnumd5.o $(SOPHYAOBJP)srandgen.o
         rm -f $(SOPHYALIBP)libBaseTools.a
  
-$(SOPHYALIBP)libBaseTools.a : $(SOPHYAOBJP)datatype.o $(SOPHYAOBJP)dvlist.o $(SOPHYAOBJP)fiondblock.o $(SOPHYAOBJP)gnumd5.o $(SOPHYAOBJP)mutyv.o $(SOPHYAOBJP)ndatablock.o $(SOPHYAOBJP)pexceptions.o $(SOPHYAOBJP)ppersist.o $(SOPHYAOBJP)ppfbinstream.o $(SOPHYAOBJP)ppftpointerio.o $(SOPHYAOBJP)rawstream.o $(SOPHYAOBJP)sophyainit.o $(SOPHYAOBJP)srandgen.o $(SOPHYAOBJP)stsrand.o $(SOPHYAOBJP)timestamp.o
+$(SOPHYALIBP)libBaseTools.a : $(SOPHYAOBJP)datatype.o $(SOPHYAOBJP)dSFMT.o $(SOPHYAOBJP)dvlist.o $(SOPHYAOBJP)fiondblock.o $(SOPHYAOBJP)gnumd5.o $(SOPHYAOBJP)mutyv.o $(SOPHYAOBJP)ndatablock.o $(SOPHYAOBJP)pexceptions.o $(SOPHYAOBJP)ppersist.o $(SOPHYAOBJP)ppfbinstream.o $(SOPHYAOBJP)ppftpointerio.o $(SOPHYAOBJP)randfmt.o $(SOPHYAOBJP)randinterf.o $(SOPHYAOBJP)randr48.o $(SOPHYAOBJP)rawstream.o $(SOPHYAOBJP)sophyainit.o $(SOPHYAOBJP)srandgen.o $(SOPHYAOBJP)stsrand.o $(SOPHYAOBJP)timestamp.o
         $(AR) $(ARFLAGS) $@ $? 
         touch $(SOPHYAINCP)/SophyaConfInfo/libsophya.objlist
@@ -59 +59 @@
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  ppftpointerio.cc
  
+$(SOPHYAOBJP)randfmt.o: randfmt.cc randfmt.h \
+  $(SOPHYAINCP)machdefs.h objfio.h anydataobj.h \
+  ppersist.h pexceptions.h gnumd5.h ppfbinstream.h rawstream.h \
+  ppfnametag.h dsfmtflags.h dSFMT.h randinterf.h
+        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  randfmt.cc
+ 
+$(SOPHYAOBJP)randinterf.o: randinterf.cc sopnamsp.h \
+  $(SOPHYAINCP)machdefs.h pexceptions.h \
+  randinterf.h anydataobj.h
+        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  randinterf.cc
+ 
+$(SOPHYAOBJP)randr48.o: randr48.cc $(SOPHYAINCP)machdefs.h \
+  thsafeop.h pexceptions.h fiondblock.h ppersist.h gnumd5.h \
+  ppfbinstream.h rawstream.h ppfnametag.h ndatablock.h anydataobj.h \
+  randr48.h objfio.h randinterf.h
+        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  randr48.cc
+ 
 $(SOPHYAOBJP)rawstream.o: rawstream.cc sopnamsp.h rawstream.h \
   $(SOPHYAINCP)machdefs.h pexceptions.h
@@ -67 +84 @@
   pexceptions.h ppersist.h gnumd5.h ppfbinstream.h rawstream.h \
   ppfnametag.h fiondblock.h ndatablock.h anydataobj.h dvlist.h objfio.h \
-  mutyv.h timestamp.h stsrand.h fiosegdb.h segdatablock.h thsafeop.h \
+  mutyv.h timestamp.h stsrand.h randr48.h randinterf.h randfmt.h \
+  dsfmtflags.h dSFMT.h fiosegdb.h segdatablock.h thsafeop.h \
   ppftpointerio.h ppfwrapstlv.h sversion.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  sophyainit.cc
@@ -82 +100 @@
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  timestamp.cc
  
+$(SOPHYAOBJP)dSFMT.o: dSFMT.c dsfmtflags.h dSFMT-params.h dSFMT.h dSFMT-params19937.h
+        $(CCOMPILE) -o $@  dSFMT.c
+ 
 $(SOPHYAOBJP)gnumd5.o: gnumd5.c $(SOPHYAINCP)machdefs.h \
   bithelp.h gnumd5.h

trunk/SophyaLib/BaseTools/basetools.h

@@ -23 +23 @@
 #include "stsrand.h"
 #include "datatype.h"
+#include "randfmt.h"
+#include "randr48.h"
 
 #endif

trunk/SophyaLib/BaseTools/objlist.list

@@ -1 +1 @@
 datatype.o
+dSFMT.o
 dvlist.o
 fiondblock.o
@@ -9 +10 @@
 ppfbinstream.o
 ppftpointerio.o
+randfmt.o
+randinterf.o
+randr48.o
 rawstream.o
 sophyainit.o

trunk/SophyaLib/BaseTools/smakefile

@@ -4 +4 @@
  
 clean:
-         rm -f $(SOPHYAOBJP)datatype.o $(SOPHYAOBJP)dvlist.o $(SOPHYAOBJP)fiondblock.o $(SOPHYAOBJP)mutyv.o $(SOPHYAOBJP)ndatablock.o $(SOPHYAOBJP)pexceptions.o $(SOPHYAOBJP)ppersist.o $(SOPHYAOBJP)ppfbinstream.o $(SOPHYAOBJP)ppftpointerio.o $(SOPHYAOBJP)rawstream.o $(SOPHYAOBJP)sophyainit.o $(SOPHYAOBJP)stsrand.o $(SOPHYAOBJP)timestamp.o $(SOPHYAOBJP)gnumd5.o $(SOPHYAOBJP)srandgen.o
+         rm -f $(SOPHYAOBJP)datatype.o $(SOPHYAOBJP)dvlist.o $(SOPHYAOBJP)fiondblock.o $(SOPHYAOBJP)mutyv.o $(SOPHYAOBJP)ndatablock.o $(SOPHYAOBJP)pexceptions.o $(SOPHYAOBJP)ppersist.o $(SOPHYAOBJP)ppfbinstream.o $(SOPHYAOBJP)ppftpointerio.o $(SOPHYAOBJP)randfmt.o $(SOPHYAOBJP)randinterf.o $(SOPHYAOBJP)randr48.o $(SOPHYAOBJP)rawstream.o $(SOPHYAOBJP)sophyainit.o $(SOPHYAOBJP)stsrand.o $(SOPHYAOBJP)timestamp.o $(SOPHYAOBJP)dSFMT.o $(SOPHYAOBJP)gnumd5.o $(SOPHYAOBJP)srandgen.o
         rm -f $(SOPHYALIBP)libBaseTools.a
  
-$(SOPHYALIBP)libBaseTools.a : $(SOPHYAOBJP)datatype.o $(SOPHYAOBJP)dvlist.o $(SOPHYAOBJP)fiondblock.o $(SOPHYAOBJP)gnumd5.o $(SOPHYAOBJP)mutyv.o $(SOPHYAOBJP)ndatablock.o $(SOPHYAOBJP)pexceptions.o $(SOPHYAOBJP)ppersist.o $(SOPHYAOBJP)ppfbinstream.o $(SOPHYAOBJP)ppftpointerio.o $(SOPHYAOBJP)rawstream.o $(SOPHYAOBJP)sophyainit.o $(SOPHYAOBJP)srandgen.o $(SOPHYAOBJP)stsrand.o $(SOPHYAOBJP)timestamp.o
+$(SOPHYALIBP)libBaseTools.a : $(SOPHYAOBJP)datatype.o $(SOPHYAOBJP)dSFMT.o $(SOPHYAOBJP)dvlist.o $(SOPHYAOBJP)fiondblock.o $(SOPHYAOBJP)gnumd5.o $(SOPHYAOBJP)mutyv.o $(SOPHYAOBJP)ndatablock.o $(SOPHYAOBJP)pexceptions.o $(SOPHYAOBJP)ppersist.o $(SOPHYAOBJP)ppfbinstream.o $(SOPHYAOBJP)ppftpointerio.o $(SOPHYAOBJP)randfmt.o $(SOPHYAOBJP)randinterf.o $(SOPHYAOBJP)randr48.o $(SOPHYAOBJP)rawstream.o $(SOPHYAOBJP)sophyainit.o $(SOPHYAOBJP)srandgen.o $(SOPHYAOBJP)stsrand.o $(SOPHYAOBJP)timestamp.o
         $(AR) $(ARFLAGS) $@ $? 
         touch $(SOPHYAINCP)/SophyaConfInfo/libsophya.objlist
@@ -59 +59 @@
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  ppftpointerio.cc
  
+$(SOPHYAOBJP)randfmt.o: randfmt.cc randfmt.h \
+  $(SOPHYAINCP)machdefs.h objfio.h anydataobj.h \
+  ppersist.h pexceptions.h gnumd5.h ppfbinstream.h rawstream.h \
+  ppfnametag.h dsfmtflags.h dSFMT.h randinterf.h
+        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  randfmt.cc
+ 
+$(SOPHYAOBJP)randinterf.o: randinterf.cc sopnamsp.h \
+  $(SOPHYAINCP)machdefs.h pexceptions.h \
+  randinterf.h anydataobj.h
+        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  randinterf.cc
+ 
+$(SOPHYAOBJP)randr48.o: randr48.cc $(SOPHYAINCP)machdefs.h \
+  thsafeop.h pexceptions.h fiondblock.h ppersist.h gnumd5.h \
+  ppfbinstream.h rawstream.h ppfnametag.h ndatablock.h anydataobj.h \
+  randr48.h objfio.h randinterf.h
+        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  randr48.cc
+ 
 $(SOPHYAOBJP)rawstream.o: rawstream.cc sopnamsp.h rawstream.h \
   $(SOPHYAINCP)machdefs.h pexceptions.h
@@ -67 +84 @@
   pexceptions.h ppersist.h gnumd5.h ppfbinstream.h rawstream.h \
   ppfnametag.h fiondblock.h ndatablock.h anydataobj.h dvlist.h objfio.h \
-  mutyv.h timestamp.h stsrand.h fiosegdb.h segdatablock.h thsafeop.h \
+  mutyv.h timestamp.h stsrand.h randr48.h randinterf.h randfmt.h \
+  dsfmtflags.h dSFMT.h fiosegdb.h segdatablock.h thsafeop.h \
   ppftpointerio.h ppfwrapstlv.h sversion.h
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  sophyainit.cc
@@ -82 +100 @@
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  timestamp.cc
  
+$(SOPHYAOBJP)dSFMT.o: dSFMT.c dsfmtflags.h dSFMT-params.h dSFMT.h dSFMT-params19937.h
+        $(CCOMPILE) -o $@  dSFMT.c
+ 
 $(SOPHYAOBJP)gnumd5.o: gnumd5.c $(SOPHYAINCP)machdefs.h \
   bithelp.h gnumd5.h

trunk/SophyaLib/BaseTools/sophyainit.cc

@@ -16 +16 @@
 
 #include "stsrand.h"
+#include "randr48.h"
+#include "randfmt.h"
 
 #include "fiosegdb.h" 
@@ -101 +103 @@
   PPRegister(ObjFileIO<RandomGenerator>);
   DObjRegister(ObjFileIO<RandomGenerator>, RandomGenerator);
+  PPRegister(ObjFileIO<DR48RandGen>);
+  DObjRegister(ObjFileIO<DR48RandGen>,DR48RandGen );
+  PPRegister(ObjFileIO<ThSDR48RandGen>);
+  DObjRegister(ObjFileIO<ThSDR48RandGen>, ThSDR48RandGen);
+  PPRegister(ObjFileIO<FMTRandGen>);
+  DObjRegister(ObjFileIO<FMTRandGen>, FMTRandGen);
 
   // Enregistrement des handlers PPF pour les SegDataBlock<T>