put wavmetrics in modules dir

BloubWorld/Makefile

@@ -7,7 +7,7 @@ all:	genbloubs movebloubs exportbloubs mergebloubs	\
 # ------------------------------------------------------------
 
 GFOPT = -Wall -Wextra -g -time  -I../Modules
-OBJS  = bloubspace.o povstuff.o mathstuff.o
+OBJS  = bloubspace.o povstuff.o
 MYLIB = '../Modules/libtth90modules.a'
 
 # ------------------------------------------------------------
@@ -37,9 +37,6 @@ bloubspace.o:	bloubspace.f90 Makefile
 povstuff.o:	povstuff.f90 Makefile
 	gfortran $(GFOPT) -c $<
 
-mathstuff.o:	mathstuff.f90 Makefile
-	gfortran $(GFOPT) -c $<
-
 # ------------------------------------------------------------
 
 genbloubs:	genbloubs.f90 Makefile $(OBJS)

Modules/Makefile

@@ -6,7 +6,7 @@
 
 GFOPT  =  -Wall -Wextra -g -I.
 
-all:	chkpixels trnd    t
+all:	chkpixels trnd
 
 # ---------------------------------------------------------
 
@@ -31,17 +31,22 @@ mathstuff2.o:	mathstuff2.f90 Makefile
 noisepictures.o:	noisepictures.f90 Makefile
 	gfortran $(GFOPT) -c $<
 
+wavmetrics.o:		wavmetrics.f90 Makefile
+	gfortran $(GFOPT) -c $<
+
 #----------------------------------------------------------
 #	making a fluffy archive
 #
 OBJECTS =	spitpgm.o		pixrgb.o	\
 		centermag.o		dummy.o		\
 		trials.o		mathstuff2.o	\
-		noisepictures.o
+		noisepictures.o		wavmetrics.o
 
 libtth90modules.a:	$(OBJECTS) Makefile
 	$(AR) 	rs $@ $?
 
+#	please explain the 'ar' command line
+
 #----------------------------------------------------------
 #     programmes de testouille
 #

Modules/README.md

@@ -11,8 +11,7 @@ Write gray level 2d buffer (aka picture) to disk in the NetPNM format.
 ### pixrgb
 
 Write 8 bits or 16 bits RGB pictures to PNM format.
-
+The width of the picture MUST be a multiple of 4 !
-**Warning!** The width of the picture MUST be a multiple of 4 !
 
 ### trials
 

Modules/mathstuff2.f90

@@ -9,12 +9,12 @@ module mathstuff2
 ! ----------------------------------------------------------------
 !   really quick'n'dirty hack
 !                  not really tested yet...
-
   subroutine init_random_seed()
 
     integer, dimension(3) :: tarray
     integer               :: t3, foo
     real                  :: dummy
+
     call itime(tarray)
     t3 = 3600*tarray(1) + 60*tarray(2) + tarray(3)
     ! write(0, '(A,3I3,A,I6)') "sranding: ", tarray, " --> ", t3
@@ -29,7 +29,9 @@ module mathstuff2
   end subroutine 
 
 ! ----------------------------------------------------------------
-
+!-
+!-      May be I can make some generic procedures ?
+!-
 logical function diff_sign(a, b)
    integer, intent(in)     :: a, b
 
@@ -45,8 +47,6 @@ logical function diff_sign(a, b)
    diff_sign = .FALSE.
 
 end function
-
-
 ! ----------------------------------------------------------------
 end module mathstuff2
 

Modules/t.f90

@@ -1,35 +0,0 @@
-program t
-
-  use      centermag
-  implicit none
-
-  type(t_centermag)      :: cmag
-
-  print *, '====== programme de test ======'
-
-  cmag%wscr = 800
-  cmag%hscr = 600
-
-  call essai_centermag(cmag)
-  print *
-
-  STOP ': PAF LE CHIEN ?'
-
-!       --------------
-contains
-!       --------------
-subroutine essai_centermag(cm)
-    type(t_centermag), intent(in)   :: cm
-
-    real                            :: rx, ry
-
-    call  print_centermag (cm)
-    print *
-
-    call  centermag_scr2real(1, 1, rx, ry)
-    print *, 'to real  :', rx, ry
-
-end subroutine
-!       --------------
-
-end program

Modules/wavmetrics.f90

@@ -0,0 +1,40 @@
+
+! new: Thu Jan  4 00:08:04 UTC 2024
+
+module wavmetrics
+
+  use mathstuff2
+  implicit none
+
+  type wavmetric
+    integer             :: num
+    real                :: freql, freqr
+    integer             :: maxl,  maxr
+  end type
+
+  type intsample
+    integer             :: left, right
+  end type
+
+  contains
+
+!-------------------------------------------------------------
+
+subroutine compute_wavmetric(samples, start, size, metrics)
+  type(intsample), intent(in)       :: samples(:)
+  integer, intent(in)               :: start, size
+  type(wavmetric), intent(out)      :: metrics
+
+end subroutine
+
+!-------------------------------------------------------------
+
+subroutine display_wavmetrics(metrics)
+  type(wavmetric), intent(in)      :: metrics
+
+end subroutine
+
+!-------------------------------------------------------------
+!-------------------------------------------------------------
+
+end module