Fancy rule setuplife-1.5.0

Removed rulestoint.py
Used addstr instead of printw where applicable
Moved help to menus.c
Moved read_num to menus.c
Version 1.5.0

Signed-off-by: Aiden Woodruff <aiden.woodruff@gmail.com>

14 files changed, 257 insertions, 110 deletions

diff --git a/ChangeLog b/ChangeLog
index 4f51942..8f78c16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,42 @@
+2018-07-29  Aiden Woodruff  <aiden.woodruff@gmail.com>
+
+        * NEWS: Added version 1.4.1 release date
+
+        * life.c (read_num): Moved to menus.c
+        Added has macro to test for bit
+        Set max width to COLS (from COLS-1)
+        board window is now whole screen
+        Set keypad to true only on board
+        Use foreach on erase at beginning of main while
+        Only set timeout for board window
+        Call fancy_rules function on C-R
+        Moved help section to menus.c (print_help)
+        Don't print lines on screen with wprintw, use mvwaddnstr
+        Use mvwchgat for current (x, y) highlighting
+        Only getch from board
+
+        * menus.c (print_copying_warranty): Don't capture width
+        Use waddstr
+        (read_num): Use getmaxx instead of COLS for width
+        (print_help): Use waddstr
+        Add C-R print
+        (fancy_rules): Function added, should only use one window
+
+        * menus.h: Add declarations
+
+        * rulestoint.py: Removed as function exists in main program
+
+        * README.md: Updated for removal of rulestoint.py
+
+        * README: Now symlink to README.md
+
+        * updatemap.c (update_map): Initialize intermap with strndup instead of malloc
+        Use has macro
+
+        * configure.ac: Updated version as life-1.5.0
+
+        Tarballed life-1.5.0.tar.gz
+
 2018-07-19  Aiden Woodruff  <aiden.woodruff@gmail.com>
 
         * life.c: Don't blindly accept commandline variables
diff --git a/NEWS b/NEWS
index 36b08cc..7fa41ca 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+2018-07-28T15:34-05:00 Aiden Woodruff
+Version life-1.4.1 released
+
 2018-07-25T00:39-05:00 Aiden Woodruff
 Version life-1.4.0 released
 
diff --git a/README b/README
index 5c11cfe..42061c0 100644..120000
--- a/README
+++ b/README
@@ -1,6 +1 @@
-# Life
-`life` runs arbitrary cellular automata models based off of a rule integer.
-
-To get a rule integer for a B/S rule string, use `rulestoint.py` with Python 3.
-
-It runs with ncurses, so make sure to install it (usually with `apt-get install ncurses-base` or the equivalent with yum) and the dev version if you intend to build it yourself.
+README.md
\ No newline at end of file
diff --git a/README.md b/README.md
index 5c11cfe..73b545c 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,4 @@
 # Life
 `life` runs arbitrary cellular automata models based off of a rule integer.
 
-To get a rule integer for a B/S rule string, use `rulestoint.py` with Python 3.
-
 It runs with ncurses, so make sure to install it (usually with `apt-get install ncurses-base` or the equivalent with yum) and the dev version if you intend to build it yourself.
diff --git a/configure b/configure
index b3e29c7..4561da1 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for life 1.4.1.
+# Generated by GNU Autoconf 2.69 for life 1.5.0.
 #
 # Report bugs to <aiden.woodruff@gmail.com>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='life'
 PACKAGE_TARNAME='life'
-PACKAGE_VERSION='1.4.1'
-PACKAGE_STRING='life 1.4.1'
+PACKAGE_VERSION='1.5.0'
+PACKAGE_STRING='life 1.5.0'
 PACKAGE_BUGREPORT='aiden.woodruff@gmail.com'
 PACKAGE_URL=''
 
@@ -1277,7 +1277,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures life 1.4.1 to adapt to many kinds of systems.
+\`configure' configures life 1.5.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1344,7 +1344,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of life 1.4.1:";;
+     short | recursive ) echo "Configuration of life 1.5.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1435,7 +1435,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-life configure 1.4.1
+life configure 1.5.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1804,7 +1804,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by life $as_me 1.4.1, which was
+It was created by life $as_me 1.5.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4306,7 +4306,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='life'
- VERSION='1.4.1'
+ VERSION='1.5.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5057,7 +5057,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by life $as_me 1.4.1, which was
+This file was extended by life $as_me 1.5.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5123,7 +5123,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-life config.status 1.4.1
+life config.status 1.5.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index d84551c..e8776fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([life], [1.4.1], [aiden.woodruff@gmail.com])
+AC_INIT([life], [1.5.0], [aiden.woodruff@gmail.com])
 AC_CONFIG_SRCDIR([life.c])
 AC_CONFIG_HEADERS([config.h])
 
diff --git a/life-1.3.3.tar.gz b/life-1.3.3.tar.gz
deleted file mode 100644
index 71b1dab..0000000
--- a/life-1.3.3.tar.gz
+++ /dev/null
diff --git a/life-1.4.1.tar.gz b/life-1.4.1.tar.gz
deleted file mode 100644
index 5cd00aa..0000000
--- a/life-1.4.1.tar.gz
+++ /dev/null
diff --git a/life-1.5.0.tar.gz b/life-1.5.0.tar.gz
new file mode 100644
index 0000000..b975fd9
--- /dev/null
+++ b/life-1.5.0.tar.gz
diff --git a/life.c b/life.c
index 058fffc..2bf9733 100644
--- a/life.c
+++ b/life.c
@@ -21,35 +21,21 @@
 
 #ifndef stat_bar_print
 // Print text to status bar in the nice way, without erasing or refreshing
-#define stat_bar_print(win,fmt,...)                                     \
+#define stat_bar_print(win, fmt,...)                                     \
   wprintw(win, fmt, ##__VA_ARGS__);                                     \
   for (int _i = getcurx(win); _i < COLS; _i++) waddch(win, ' ');
 #endif
 
 #ifndef foreach
-#define foreach(func,count,first,...)                           \
+#define foreach(func, count, first,...)                           \
   {typeof(first) things[] = {__VA_ARGS__};                      \
     func(first);                                                \
     for (int _i = 0; _i < count - 1; _i++) func(things[_i]);}
 #endif
 
-int read_num (WINDOW * win, int min, int max) {
-  int ret = 0;
-  werase(win);
-  char * text = (char*) malloc((size_t)(COLS + 1));
-  memset(text, 0, (size_t)(COLS + 1));
-  curs_set(1);
-  echo();
-  wgetnstr(win, text, (size_t)(COLS + 1));
-  ret = (int) strtol((const char *) text, NULL, 10);
-  if (!(ret >= min && ret <= max)) {
-    ret = 0;
-  }
-  noecho();
-  curs_set(0);
-  free(text);
-  return ret;
-}
+#ifndef has
+#define has(var, bit) ((var & bit) == bit)
+#endif
 
 int main (int argc, char * argv[]) {
   unsigned int RULE = 0;
@@ -58,7 +44,6 @@ int main (int argc, char * argv[]) {
   initscr();
   raw();
   curs_set(0);
-  keypad(stdscr, TRUE);
   noecho();
   RULE = args_info.ruleint_arg;
   srand(time(NULL));
@@ -73,8 +58,8 @@ int main (int argc, char * argv[]) {
   int livecell = '#';
   int deadcell = '.';
   if (args_info.width_given) {
-    if (args_info.width_arg > COLS - 1) {
-      width = COLS - 1;
+    if (args_info.width_arg > COLS) {
+      width = COLS;
     } else if (args_info.width_arg < 1) {
       width = 1;
     } else {
@@ -116,13 +101,14 @@ int main (int argc, char * argv[]) {
     }
   }
   if (args_info.maximize_given) {
-    width = COLS - 1;
+    width = COLS;
     height = LINES - 2;
   }
   cmdline_parser_free(&args_info);
-  WINDOW * board = newwin(height, width + 1, 0, 0);
+  WINDOW * board = newwin(LINES - 2, COLS, 0, 0);
   WINDOW * stat_bar = newwin(1, 0, LINES - 2, 0);
   WINDOW * entry = newwin(1, 0, LINES - 1, 0);
+  keypad(board, TRUE);
   wstandout(stat_bar);
   char * map = NULL;
   map = malloc((height * width)+1);
@@ -131,10 +117,7 @@ int main (int argc, char * argv[]) {
   int x = width/2;
   int y = height/2;
   while (ch != 'q') {
-    erase();
-    werase(board);
-    werase(stat_bar);
-    werase(entry);
+    foreach(werase, 4, stdscr, board, stat_bar, entry);
     if (playing == FALSE) {
       // Numpad and arrow directions
       if (ch == KEY_UP) {
@@ -165,7 +148,7 @@ int main (int argc, char * argv[]) {
         }
       } else if (ch == '\n') {
         playing = TRUE;
-        timeout(timeout_val);
+        wtimeout(board, timeout_val);
       } else if (ch == 'c') {
         memset(map, deadcell, width*height);
       } else if (ch == 'r') {
@@ -181,43 +164,37 @@ int main (int argc, char * argv[]) {
         }
         werase(stat_bar);
         werase(entry);
-      } else if (keyname(ch) == "^R") {
-        // Fancy rule selection
-        // TODO (aiden.woodruff@gmail.com) Write
+      } else if (strcmp(keyname(ch), "^R") == 0) {
+        foreach(werase, 4, stdscr, board, stat_bar, entry);
+        stat_bar_print(stat_bar, "Click Cancel to exit or Done to exit and save rule");
+        wrefresh(stat_bar);
+        int ruleint = fancy_rules(board, RULE, timeout_val);
+        if (ruleint != -1) {
+          RULE = ruleint;
+        }
       } else if (ch == 'h') {
-        timeout(-1);
-        erase();
-        foreach(werase, 3, board, stat_bar, entry);
+        wtimeout(board, -1);
+        foreach(werase, 3, stdscr, board, stat_bar);
         stat_bar_print(stat_bar, "Press any key to return");
-        printw("Arrow keys - Motion\n");
-        printw("Space - Flip cell (if it's alive, to dead, and vice versa)\n");
-        printw("Enter - Pause/Play\n");
-        printw("\tN.B. - Many keys can only be used while paused.\n");
-        printw(", - Lower delay time\n");
-        printw(". - Increase delay time\n");
-        printw("R - Input a rule-int\n");
-        // TODO printw("Ctrl+R - Open the fancy rule menu\n");
-        printw("Ctrl+L - Redraw screen\n");
-        printw("W - Show warranty\n");
-        printw("V - Print version\n");
-        foreach(wnoutrefresh, 3, stdscr, entry, stat_bar);
+        print_help(board);
+        foreach(wnoutrefresh, 3, stdscr, board, stat_bar);
         doupdate();
         getch();
-        timeout(timeout_val);
+        wtimeout(board, timeout_val);
       } else if (ch == 'w') {
-        timeout(-1);
+        wtimeout(board, -1);
         foreach(werase, 4, stdscr, board, stat_bar, entry);
         stat_bar_print(stat_bar, "Press any key to return");
-        print_copying_warranty(stdscr);
+        print_copying_warranty(board);
         foreach(wnoutrefresh, 3, stdscr, entry, stat_bar);
         doupdate();
         getch();
-        timeout(timeout_val);
+        wtimeout(board, timeout_val);
       }
     } else { // ie PLAYING == TRUE
       if (ch == '\n') {
         playing = FALSE;
-        timeout(-1);
+        wtimeout(board, -1);
       }
     }
 
@@ -230,16 +207,9 @@ int main (int argc, char * argv[]) {
       foreach(wclear, 4, stdscr, entry, stat_bar, board);
     }
     for (int i = 0; i < height; ++i) {
-      if (i == y) {
-        wprintw(board, "%.*s", x, map + (y * width));
-        wstandout(board);
-        wprintw(board, "%.1s", map + (y * width) + x);
-        wstandend(board);
-        wprintw(board, "%.*s\n", width-(x+1), (map + (i * width) + x + 1));
-      } else {
-        wprintw(board, "%.*s\n", width, (map + (i * width)));
-      }
+      mvwaddnstr(board, i, 0, map + (i * width), width);
     }
+    mvwchgat(board, y, x, 1, A_STANDOUT, COLOR_PAIR(0), NULL);
     stat_bar_print(stat_bar, "(%d, %d)\t\tGeneration: %d\t\tDelay Time: %d", x, y, generation, delaymax);
     foreach(wnoutrefresh, 4, stdscr, board, entry, stat_bar);
     doupdate();
@@ -251,7 +221,7 @@ int main (int argc, char * argv[]) {
         update_map(map, width, height, livecell, deadcell, RULE);
       }
     }
-    ch = getch();
+    ch = wgetch(board);
     if (ch <= 'Z' && ch >= 'A') {
       ch -= ('A' - 'a');
     }
diff --git a/menus.c b/menus.c
index 189a69b..e29e084 100644
--- a/menus.c
+++ b/menus.c
@@ -1,7 +1,159 @@
 #include "menus.h"
 
+#ifndef has
+#define has(var, bit) ((var & bit) == bit)
+#endif
+
 int print_copying_warranty (WINDOW * win) {
-  int width = getmaxx(win);
   const char * WARRANTY = "  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW.\n  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE.\n  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU.\n  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.";
-  return wprintw(win, WARRANTY);
+  return waddstr(win, WARRANTY);
+}
+
+int print_help (WINDOW * win) {
+  if (waddstr(win, "Arrow keys - Motion\n") == OK &&
+      waddstr(win, "Space - Flip cell (if it's alive, to dead, and vice versa)\n") == OK &&
+      waddstr(win, "Enter - Pause/Play\n") == OK &&
+      waddstr(win, "\tN.B. - Many keys can only be used while paused.\n") == OK &&
+      waddstr(win, ", - Lower delay time\n") == OK &&
+      waddstr(win, ". - Increase delay time\n") == OK &&
+      waddstr(win, "R - Input a rule-int\n") == OK &&
+      waddstr(win, "Ctrl+R - Open the fancy rule menu\n") == OK &&
+      waddstr(win, "Ctrl+L - Redraw screen\n") == OK &&
+      waddstr(win, "W - Show warranty\n") == OK &&
+      waddstr(win, "V - Print version\n") == OK) {
+    return OK;
+  } else {
+    return ERR;
+  }
+}
+
+int read_num (WINDOW * win, int min, int max) {
+  int ret = 0;
+  werase(win);
+  int width = getmaxx(win);
+  char * text = (char*) malloc((size_t)(width + 1));
+  memset(text, 0, (size_t)(width + 1));
+  curs_set(1);
+  echo();
+  wgetnstr(win, text, (size_t)(width + 1));
+  ret = (int) strtol((const char *) text, NULL, 10);
+  if (!(ret >= min && ret <= max)) {
+    ret = 0;
+  }
+  noecho();
+  curs_set(0);
+  free(text);
+  return ret;
+}
+
+// Fancy rule menu, returns new rules or -1 on fail
+int fancy_rules (WINDOW * win, int ruleint, int speed) {
+  int done = FALSE;
+  int cursor = 0;
+  int ch = 0;
+  wtimeout(win, speed);
+  while (done == FALSE && ch != 'q') {
+    werase(win);
+    waddstr(win, "Press space to toggle buttons\n");
+    wprintw(win, "Rule int: %d\n", ruleint);
+    waddch(win, 'B');
+    for (int i = 0; i < 9; i++) {
+      if (cursor == i) {
+        wstandout(win);
+      }
+      waddch(win, has(ruleint, 1 << i) ? '1' : '0');
+      if (cursor == i) {
+        wstandend(win);
+      }
+    }
+    waddstr(win, "/S");
+    for (int i = 9; i < 18; i++) {
+      if (cursor == i) {
+        wstandout(win);
+      }
+      waddch(win, has(ruleint, 1 << i) ? '1' : '0');
+      if (cursor == i) {
+        wstandend(win);
+      }
+    }
+    waddstr(win, "\n");
+    if (cursor == 18) {
+      wstandout(win);
+      waddstr(win, "Cancel");
+      wstandend(win);
+    } else {
+      waddstr(win, "Cancel");
+    }
+    waddstr(win, "  ");
+    if (cursor == 19) {
+      wstandout(win);
+      waddstr(win, "Default");
+      wstandend(win);
+    } else {
+      waddstr(win, "Default");
+    }
+    waddstr(win, "  ");
+    if (cursor == 20) {
+      wstandout(win);
+      waddstr(win, "Done");
+      wstandend(win);
+    } else {
+      waddstr(win, "Done");
+    }
+    wrefresh(win);
+    if (ch == KEY_LEFT) {
+      if (cursor > 0 && cursor < 18) {
+        cursor--;
+      } else if (cursor > 18) {
+        cursor--;
+      }
+    } else if (ch == KEY_RIGHT) {
+      if (cursor < 17) {
+        cursor++;
+      } else if (cursor > 17 && cursor < 20) {
+        cursor++;
+      }
+    } else if (ch == KEY_UP || ch == KEY_DOWN) {
+      if (cursor > 17) {
+        switch (cursor) {
+        case 18:
+          cursor = 0;
+          break;
+        case 19:
+          cursor = 6;
+          break;
+        case 20:
+          cursor = 13;
+          break;
+        }
+      } else {
+        if (cursor > -1 && cursor < 6) {
+          cursor = 18;
+        } else if (cursor > 5 && cursor < 13) {
+          cursor = 19;
+        } else if (cursor > 12) {
+          cursor = 20;
+        }
+      }
+    } else if (ch == ' ' || ch == '\n') {
+      switch (cursor) {
+      case 18:
+        return -1;
+        break;
+      case 19:
+        ruleint = 6152;
+        break;
+      case 20:
+        return ruleint;
+        break;
+      default:
+        ruleint ^= 1 << cursor;
+        break;
+      }
+    }
+    if (done == FALSE) {
+      ch = wgetch(win);
+    }
+  }
+  ch = 0;
 }
diff --git a/menus.h b/menus.h
index 567ae19..e507ad8 100644
--- a/menus.h
+++ b/menus.h
@@ -1,8 +1,13 @@
 #include <ncurses.h>
+#include <string.h>
+#include <stdlib.h>
 
 #ifndef LIFE_MENUS_H_
 #define LIFE_MENUS_H_
 
 int print_copying_warranty (WINDOW * win);
+int print_help (WINDOW * win);
+int read_num (WINDOW * win, int min, int max);
+int fancy_rules (WINDOW * win, int ruleint, int speed);
 
 #endif // LIFE_MENUS_H_
diff --git a/rulestoint.py b/rulestoint.py
deleted file mode 100755
index 342f01e..0000000
--- a/rulestoint.py
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/python3
-rulestring = input("Rule String (B/S): ")
-bornstring = rulestring[rulestring.index('B')+1:rulestring.index('/')]
-survivestring = rulestring[rulestring.index('S')+1:]
-bornarr = [0]*9
-survivearr = [0] * 9
-ruleint = 0
-for i in range(len(bornstring)):
-    bornarr[int(bornstring[i])] = True
-for i in range(len(survivestring)):
-    survivearr[int(survivestring[i])] = True
-for i in range(9):
-    if (bornarr[i]):
-        ruleint |= 2**i
-    if (survivearr[i]):
-        ruleint |= 2**(i+9)
-print(ruleint)
diff --git a/updatemap.c b/updatemap.c
index d33b05a..fdf9769 100644
--- a/updatemap.c
+++ b/updatemap.c
@@ -1,13 +1,14 @@
 #include "updatemap.h"
 
+#ifndef has
+#define has(var, bit) ((var & bit) == bit)
+#endif
+
 char * update_map (char * base_map, const int width, const int height, char livecell, char deadcell, const unsigned int ruleint) {
-  char * intermap = malloc((width * height)+1);
-  memset(intermap, 0, (width*height)+1);
-  strcpy(intermap, base_map);
-  // Change intermap and stuff
+  char * intermap = (char*) strndup(base_map, width * height);
   for (int i = 0, x = 0, y = 0, surround = 0; i < width*height; i++, surround = 0) {
     x = i % width;
-    y = (i - x)/width;
+    y = (i - x) / width;
     /*
       Where i is the current cell:
        A1 | A2 | A3
@@ -31,25 +32,26 @@ char * update_map (char * base_map, const int width, const int height, char live
         if (base_map[i+1-width] == livecell) surround++; // A3
       }
       if (y < height - 1) {
-        if (base_map[i+1+width] == livecell) surround++; // C3
+        if (base_map[i + 1 + width] == livecell) surround++; // C3
       }
     }
     if (y > 0) {
-      if (base_map[i-width] == livecell) surround++;
+      if (base_map[i - width] == livecell) surround++;
     }
     if (y < height - 1) {
-      if (base_map[i+width] == livecell) surround++;
+      if (base_map[i + width] == livecell) surround++;
     }
     if (base_map[i] == deadcell) {
-      if ((ruleint & (1 << surround)) == (1 << surround)) {
+      if (has(ruleint, 1 << surround)) {
         intermap[i] = livecell;
       }
     } else if (base_map[i] == livecell) {
-      if ((ruleint & (1 << (surround + 9))) != (1 << (surround + 9))) {
+      if (has(ruleint, 1 << surround + 9)) {
         intermap[i] = deadcell;
       }
     }
   }
+
   // Rewrite map
   strcpy(base_map, intermap);
   free(intermap);