Changeset 2741

Timestamp:

2001-09-20T14:31:59+12:00 (23 years ago)

Author:

kjm18

Message:

updated mg to be in line with version mg-1.3f. Now uses long long for
some variables to enable indexing of very large collections.

Location:

trunk/gsdl/packages/mg/lib

Files:

• Makefile.in (modified) (1 diff)
• WIN32.MAK (modified) (1 diff)
• bitio_gen.c (modified) (2 diffs)
• bitio_random.c (modified) (4 diffs)
• bitio_random.h (modified) (3 diffs)
• longlong.h (added)
• win32in.c (modified) (1 diff)
• win32in.h (modified) (1 diff)

trunk/gsdl/packages/mg/lib/Makefile.in

@@ -83 +83 @@
     bitio_m_mems.h     bitio_stdio.h      huffman_stdio.h    sptree.h \
     pathmax.h          getpagesize.h \
-    random.h           simplefrenchstem.h unitool.h
+    random.h           simplefrenchstem.h unitool.h  longlong.h
 # regex.h            rx.h               
 

trunk/gsdl/packages/mg/lib/WIN32.MAK

@@ -54 +54 @@
     bitio_m_mems.h     bitio_stdio.h      huffman_stdio.h    sptree.h \
                        rx.h               pathmax.h          getpagesize.h \
-    random.h           win32in.h          simplefrenchstem.h unitool.h
+    random.h           win32in.h          simplefrenchstem.h unitool.h \
+    longlong.h  
 
 SOURCES = \

trunk/gsdl/packages/mg/lib/bitio_gen.c

@@ -24 +24 @@
 /*
    $Log$
+   Revision 1.2  2001/09/21 12:45:03  kjm18
+   updated mg to be in line with version mg-1.3f. Now uses long long for
+   some variables to enable indexing of very large collections.
+
    Revision 1.1  1999/08/10 21:16:42  sjboddie
    renamed mg-1.3d directory mg
@@ -131 +135 @@
 }
 
+
+/* adjustment is a hack to overcome inaccuracies in floating point,
+   where (int)(ln4/ln2) can equal 1, not 2. */
+/* copied from mg-1.3f, 17-09-01 kjm18 */
 int 
 BIO_Gamma_Bound (int N, int p)
 {
-  return ((int) (p * (2 * log2 ((double) N / p) + 1)));
+  //return ((int) (p * (2 * log2 ((double) N / p) + 1)));
+  return ((int) (p * (2 * log2 (((double) N * 1.0001) / p) + 1)));
 }
 

trunk/gsdl/packages/mg/lib/bitio_random.c

@@ -1 @@
-/**************************************************************************
+/*************************************************************************
  *
  * bitio_random.c -- Functions for bitio to a file (random access)
@@ -24 +24 @@
 /*
    $Log$
+   Revision 1.2  2001/09/21 12:45:03  kjm18
+   updated mg to be in line with version mg-1.3f. Now uses long long for
+   some variables to enable indexing of very large collections.
+
    Revision 1.1  1999/08/10 21:16:46  sjboddie
    renamed mg-1.3d directory mg
@@ -42 +46 @@
 #include "memlib.h"
 
+#include "longlong.h"
+
 #include "bitio_m_random.h"
 #include "bitio_m.h"
@@ -284 +290 @@
     return (t);
 }
+
+#ifdef USE_LONG_LONG
+
+void 
+BIO_Random_Seek_LL (mg_ullong pos, random_bitio_state * bs)
+{
+  ENCODE_CONTINUE(*bs)
+
+    if ((((pos) >> 3) >= (mg_ullong)__base) &&
+    ((((pos)+7) >> 3) < (mg_ullong)(__base + __len)))
+      {
+    __pos = (long)((pos) - (mg_ullong)(__base << 3));
+      }
+    else
+      {
+        ENCODE_FLUSH;
+    __base = (long)(((pos) >> (__sft+3)) << __sft);
+    
+    fseek(__file,__base,0);
+    fread(__buf,1,__len,__file);
+    __pos = (long)((pos) & ((8 << __sft)-1));
+      }
+  
+  ENCODE_PAUSE(*bs)
+}
+
+mg_ullong 
+BIO_Random_Tell_LL (random_bitio_state * bs)
+{
+  mg_ullong t;
+  ENCODE_CONTINUE(*bs)
+    t = (((mg_ullong)__base) << 3ull) + __pos;
+  ENCODE_PAUSE(*bs)
+  return(t);  
+}
+
+#endif

trunk/gsdl/packages/mg/lib/bitio_random.h

@@ -30 +30 @@
  *  and just continue processing.
  *
+ *  Modified:
+ *   - long long seek and tell ops
+ *     (1999-08-03 Tim Bell <[email protected]>)
  **************************************************************************/
 
@@ -35 +38 @@
 #define H_BITIO_RANDOM
 
+#include "longlong.h"
 
 
@@ -114 +118 @@
 unsigned long BIO_Random_Tell (random_bitio_state * bs);
 
+#ifdef USE_LONG_LONG
+
+void BIO_Random_Seek_LL (mg_ullong pos, random_bitio_state * bs);
+mg_ullong BIO_Random_Tell_LL (random_bitio_state * bs);
+
+#endif /* USE_LONG_LONG */
 
 #endif

trunk/gsdl/packages/mg/lib/win32in.c

@@ -9 +9 @@
 
     return x;
+}
+
+mg_ullong ntohll(mg_ullong y)
+{
+#if defined (LITTLE_ENDIAN) || defined(_LITTLE_ENDIAN) || defined(__LITTLE_ENDIAN)
+    x = 
+      ((x >> 56) & 0x00000000000000FF) | ((x >> 40) & 0x000000000000FF00) |
+      ((x >> 24) & 0x0000000000FF0000) | ((x >> 8)  & 0x00000000FF000000) |
+      ((x << 8)  & 0x000000FF00000000) | ((x << 24) & 0x0000FF0000000000) |
+        ((x << 40) & 0x00FF000000000000) | ((x << 56) & 0xFF00000000000000);
+#endif
+  return x;
 }
 

trunk/gsdl/packages/mg/lib/win32in.h

@@ -4 +4 @@
 unsigned long htonl(unsigned long x);
 unsigned long ntohl(unsigned long x);
+mg_ullong ntohll(mg_ullong x);
 unsigned short htons(unsigned short x);
 unsigned short ntohs(unsigned short x);