Sincronización de algunos detalles. Nada importante.

diff --git a/Doxyfile b/Doxyfile
index 72695093ec755d393d8c45b5fa05e7018ea0a023..b82386f945ff92ec958f8af4d5c6681ad44f7d50 100644 (file)
--- a/Doxyfile
+++ b/Doxyfile
@@ -1,4 +1,4 @@
-# Doxyfile 1.3.6-20040222
+# Doxyfile 1.3.7
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project
@@ -32,6 +32,15 @@ PROJECT_NUMBER         = 0.1
 
 OUTPUT_DIRECTORY       = doc/api
 
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
+# 2 levels of 10 sub-directories under the output directory of each output 
+# format and will distribute the generated files over these directories. 
+# Enabling this option can be useful when feeding doxygen a huge amount of source 
+# files, where putting all generated files in the same directory would otherwise 
+# cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all 
 # documentation generated by doxygen is written. Doxygen will use this 
 # information to generate all constant output in the proper language. 
@@ -100,12 +109,21 @@ FULL_PATH_NAMES        = NO
 # If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
 # can be used to strip a user-defined part of the path. Stripping is 
 # only done if one of the specified strings matches the left-hand part of 
-# the path. It is allowed to use relative paths in the argument list. 
+# the path. The tag can be used to show relative paths in the file list. 
 # If left blank the directory from which doxygen is run is used as the 
 # path to strip.
 
 STRIP_FROM_PATH        = 
 
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
+# the path mentioned in the documentation of a class, which tells 
+# the reader which header file to include in order to use a class. 
+# If left blank only the name of the header file containing the class 
+# definition is used. Otherwise one should specify the include paths that 
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    = 
+
 # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
 # (but less readable) file names. This can be useful is your file systems 
 # doesn't support long names like on DOS, Mac, or CD-ROM.
@@ -211,6 +229,13 @@ EXTRACT_STATIC         = YES
 
 EXTRACT_LOCAL_CLASSES  = YES
 
+# This flag is only useful for Objective-C code. When set to YES local 
+# methods, which are defined in the implementation section but not in 
+# the interface are included in the documentation. 
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS  = NO
+
 # If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
 # undocumented members of documented classes, files or namespaces. 
 # If set to NO (the default) these members will be included in the 
@@ -391,7 +416,8 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = emufs emufs_gui
+INPUT                  = emufs \
+                         emufs_gui
 
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
@@ -492,13 +518,13 @@ STRIP_CODE_COMMENTS    = YES
 # then for each documented function all documented 
 # functions referencing it will be listed.
 
-REFERENCED_BY_RELATION = YES
+REFERENCED_BY_RELATION = NO
 
 # If the REFERENCES_RELATION tag is set to YES (the default) 
 # then for each documented function all documented entities 
 # called/used by that function will be listed.
 
-REFERENCES_RELATION    = YES
+REFERENCES_RELATION    = NO
 
 # If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
 # will generate a verbatim copy of the header file for each class for 

diff --git a/doc/informe_2da_entrega.lyx b/doc/informe_2da_entrega.lyx
index b79ce8989fad7085183ae52d2368a04108af7993..1c34de4b003f8411689bcdb8a2040b0ff6ded4dc 100644 (file)
--- a/doc/informe_2da_entrega.lyx
+++ b/doc/informe_2da_entrega.lyx
@@ -94,7 +94,8 @@ Exhaustivo
 
 Con la autorización de los ayudantes de la cátedra decidimos que el árbol
  B+ sólo pueda ser utilizado para índices principal ya que de otra manera
- no tiene sentido el set secuencial.
+ no tiene sentido el set secuencial (para una justificación más detallada
+ ver FIXME: REFERENCIA A EXPLICACION DE B+)3.
 \layout Standard
 
 Finalmente, para obtener listados basados en campos de los cuales no se
@@ -151,7 +152,8 @@ indices.h
 \family typewriter 
 INDICE_DATO
 \family default 
-: usado para representar el conjunto de un ID más su dato.
+: usado para representar el conjunto de un ID más la ubicación del dato
+ asociado.
 \layout Itemize
 
 
@@ -276,8 +278,6 @@ EMUFS
 Integración con 
 \family typewriter 
 EMUFS
-\family default 
-.
 \layout Standard
 
 Para integrar la utilización de índices a 
@@ -287,7 +287,7 @@ EMUFS
  fueron necesarios los siguientes cambios:
 \layout Paragraph
 
-Nuevos tipos de archivo.
+Nuevos tipos de archivo
 \layout Standard
 
 Se incluyen dos tipos de archivo nuevos T4 y T5, que representan, respectivament
@@ -301,7 +301,7 @@ EMUFS
  ya que al saber que es T4 o T5 siempre se inserta de forma ordenada.
 \layout Paragraph
 
-Puntero a un arreglo de índices.
+Puntero a un arreglo de índices
 \layout Standard
 
 Se agrega a la estructura 
@@ -313,4 +313,19 @@ EMUFS
 INDICE
 \family default 
 , donde el primero es siempre el índice principal.
+\layout Chapter
+
+Implementación
+\layout Section
+
+Árbol B
+\layout Section
+
+Árbol B*
+\layout Section
+
+Árbol B+
+\layout Section
+
+Ordenamiento externo
 \the_end

diff --git a/emufs/indices.h b/emufs/indices.h
index 8dc77ffb643b9998d1c9b501f668ff271fe42f6b..ff2e41e2294ab191ca8958097cbea3283f29a41b 100644 (file)
--- a/emufs/indices.h
+++ b/emufs/indices.h
@@ -101,11 +101,11 @@ typedef struct _indices_h_ {
        /** EMUFS Donde se guardan INDICE_DATO de multiples claves con repeticion
         *
         *  La forma de guardar es la siguiente :
-        *  \code
+        *  <pre>
         *  +------+---------//---------+
         *  | CANT |    DATA \\         |
         *  +------+---------//---------+
-        *  \endcode
+        *  </pre>
         *
         *  Donde CANT es un entero (int) y DATA es un array
         *  de INDICE_DATO que apunta al archivo de datos