add gameType params

Dkhodos · Sep 3, 2023 · 72e7454 · 72e7454
1 parent 8238859
commit 72e7454
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/reports/report.template.html b/reports/report.template.html
@@ -13,6 +13,7 @@
         var numberOfAgents = {{numberOfAgents}};
         var fraction = {{fraction}};
         var probability = {{probability}};
+        var gameType = {{gameType}};
     </script>
 </head>
 <body>

diff --git a/reports/script.js b/reports/script.js
@@ -14,7 +14,7 @@
     `;
 
     const HUSBAND_SVG = `
-        <svg height="40px" width="40px" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--emojione-monotone" preserveAspectRatio="xMidYMid meet"><path d="M48.488 15.598c-.309.271-.902.782-1.793-.144c-.889-.925-.34-1.521.068-2.003c.166-.197.425-.429.425-.902c0-.434-.874-.831-.469-.487c0 0 .519.237-.148 1.226c-.468-.243-1.208-.104-1.208-.104c.605.051.944.209 1.082.29c-.341.456-.728 1.002-.281 1.657c.491.722 1.111 1.455 2.133.865c1.022-.589.725-.867.191-.398" fill="#000000"></path><path d="M49.457 12.458c.484-.523.917-1.144.954-1.721a1.324 1.324 0 0 0-.354-.997c-.172-.183-.699-.74-1.483-.74c-.537 0-1.035.258-1.482.766c-.136.154-.389.414-.746.774a1.65 1.65 0 0 0-.342-.037c-.824 0-1.26.605-1.424.833l-.035.047c-.226.291-.428.808-.585 1.278c-.019-.075-.04-.146-.058-.222c0 0-1.707 1.41-2.902 2.674c0 0 .049.251.18.609c-1.377 1.593-2.974 2.732-4.433 3.54c.355-.831.544-1.871.544-3.175c0-2.71-.291-4.561-.902-5.839C42.492 8.836 38.961 2 38.961 2c-4.336 1.922-8.472.207-13.168.799c-9.313 1.175-7.273 5.56-7.273 5.56c-1.764 1.94-1.281 4.355.936 7.031c.46.556.803 1.205 1.063 1.881c.084.419.211.812.371 1.184c.246.992.349 1.971.384 2.753c-7.052 5.479-8.318 7.716-7.914 11.527a3.126 3.126 0 0 0-.358.367s.285 1.215.368 2.4c-.293.918-.634 2.951 1.002 5.15c.556.748 1.676 1.23 2.854 1.23c.596 0 1.184-.119 1.749-.35c.456-.188 1.083-.516 1.266-1.195c.196-.729-.249-1.287-.606-1.736a8.204 8.204 0 0 1-.162-.207c.282-.414.484-.961.189-1.6a2.377 2.377 0 0 0-.527-.707c-.133-.705-.264-1.955.223-2.986c0 0-.096-.214-.411-.462c.498-1.455 1.653-3.242 4.33-4.619c-.063 1.502-.405 5.099-2.12 10.218l-.081.244l.156.207c.034.043.444.566 1.374 1.086c-.346 1.195-.444 2.932.176 5.438c.816 3.297-.842 9.219-3.856 13.771l-.343.518l.592.221c.036.014.461.164 1.14.326c-.086.547-.036 1.23.434 1.951h2.942v-1.133S24.183 62 28.677 62c1.555 0 1.718-1.473.082-1.559c-.579-.031-.92-.195-1.192-.471c.27-.076.538-.152.799-.246l.499-.182l-.203-.48c-.012-.029-1.228-3.035.965-8.734c.338-.881.236-1.715.119-2.682c-.143-1.156-.313-2.561.305-4.529c.799 1.021 2.578 2.996 6.422 6.342c-.237 1.225-1.021 6.014.303 9.953l.07.211l.21.09c.05.021.319.123.936.225c-.115.562-.09 1.292.41 2.062h2.945v-1.133S41.836 62 46.331 62c1.555 0 1.719-1.473.082-1.559c-.584-.031-.924-.205-1.196-.486c.798-.104 1.212-.207 1.245-.217l.891-.23l-.67-.617c-.029-.027-2.941-2.779-4.505-10.789c-.261-1.332-1.308-2.383-2.633-3.715c-1.142-1.148-2.515-2.545-3.669-4.465c3.232-.131 4.996-.523 5.197-1.18l.049-.162l-.061-.156c-2.506-6.476-2.707-12.91-2.719-14.377c2.238-1.034 4.639-2.83 6.322-4.209c.086.039.168.082.26.116c0 0 1.878-.975 2.945-2.131l-.017-.01l.185-.112C50.527 16.177 51 15.517 51 14.833c0-.891-.787-1.752-1.543-2.375m-27.081.536c1.44.937 2.341 4.827 2.341 4.827c.98-.536.795-1.337.795-1.337c-1.273-2.865-1.754-7.088-1.754-7.088c4.273-.539 4.391 1.91 11.607 1.028c.654 1.128.899 2.894.899 5.663c0 4.381-2.212 5.223-6.567 5.302c-1.637.031-3.71-.129-5.377-.902c-.121-2.042-1.395-3.952-1.395-3.952s-.54.205-1.267-1.01c-.728-1.213-.722-3.466.718-2.531m9.177 13.73s-.489-2.395-2.023-4.333l.188-.001a21.291 21.291 0 0 0 2.043-.128c-.454 2.011-.208 4.462-.208 4.462m.017.49c2.195 5.285-.832 10.505-.832 10.505c2.177-5.808.832-10.505.832-10.505M18.574 40.611a3.546 3.546 0 0 1-1.349.271c-.932 0-1.702-.385-2.023-.816c-1.148-1.545-1.137-2.971-.97-3.818c.731-.133 1.909-.221 3.393.02c.243.119.745.404 1.006.789c.127.322-.284.844-.528.613c-.377-.354-.879-.814-.879-.814c.643.656.991 1.457.991 1.457c.558 1.162 1.828 1.695.359 2.298m3.649-2.338c2.26-6.865 2.096-10.912 2.088-11.083l-.035-.736l-.689.304c-3.416 1.506-4.918 3.645-5.565 5.419a4.53 4.53 0 0 0-.797-.188l-.718 2.847l-.682-2.779s-.698-.191-1.516.096c-.213-2.969.994-4.964 6.97-9.671c-.009.236-.021.38-.021.38c2.604.414 2.919-.57 3.017-1.313c.785.316 1.622.523 2.459.652l.188.093c.045.098.078.196.121.294l-1.777.724s.988.161 2.361.78c2.518 7.404-.053 14.267-.679 15.743c-2.893-.077-4.279-1.132-4.725-1.562m16.586 6.809c1.206 1.213 2.159 2.17 2.361 3.207c1.209 6.191 3.188 9.357 4.191 10.635c-.754.109-2.016.238-3.775.238c-2.366 0-3.498-.203-3.918-.307c-1.286-4.16-.148-9.42-.137-9.473l.063-.285l-.223-.193c-6.033-5.23-6.995-7.086-7.002-7.098l-.499-1.074l-.446 1.098c-1.098 2.697-.878 4.492-.701 5.936c.105.869.189 1.559-.063 2.213c-1.847 4.803-1.413 7.822-1.114 8.961a12.28 12.28 0 0 1-3.649.533c-1.641 0-3.01-.297-3.754-.5c2.969-4.742 4.49-10.537 3.635-13.994c-.549-2.219-.488-3.738-.228-4.766c.919.352 2.142.627 3.734.627h.325l.139-.287c.046-.092.34-.715.689-1.732l4.491.221c-.051.107-.09.182-.093.188l-.426.744h.873c.508 0 .976-.006 1.435-.016c1.267 2.269 2.819 3.845 4.092 5.124m4.929-25.801c-1.701 1.375-4.031 3.085-6.115 3.988l-.299.129l-.007.317c-.001.073-.12 7.234 2.608 14.592c-1.257-.289-3.462.213-4.987.646a54.51 54.51 0 0 1-.854.014c.757-1.85 2.247-7.064-.379-15.375c.968-.971 1.832-1.472 1.832-1.472c-.495-.513-1.532-.327-1.745-.281c.563-.186 1.07-.426 1.506-.742c1.846-.766 4.297-2.111 6.375-4.391c.125.193.264.387.436.573l2.537-1.277l-1.855 2.324c0 .001.336.482.947.955m3.754-2.427c-1.285-.801-2.26-1.954-2.734-3.303c0 0 .339-1.22.605-1.563c.125-.16.302-.485.641-.485c.153 0 .34.066.569.244c.7-.698 1.097-1.102 1.298-1.33c.247-.281.475-.417.703-.417c.233 0 .469.143.727.417c.512.541-1.43 2.14-1.43 2.14s2.102 1.328 2.102 2.276c0 .436-1.496 1.418-2.481 2.021" fill="#000000"></path><ellipse cx="27.239" cy="13.425" rx="1.489" ry="1.451" fill="#000000"></ellipse><ellipse cx="34.526" cy="13.425" rx="1.491" ry="1.451" fill="#000000"></ellipse><path d="M28.275 18.165c.465.829 1.404 1.569 2.604 1.569c1.203 0 2.145-.74 2.609-1.569c.125-.223-.042-.463-.226-.325c-1.532 1.162-3.237 1.154-4.763 0c-.184-.138-.349.102-.224.325" fill="#000000"></path></svg>
+    <svg height="40px" width="40px" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--emojione-monotone" preserveAspectRatio="xMidYMid meet"><path d="M48.488 15.598c-.309.271-.902.782-1.793-.144c-.889-.925-.34-1.521.068-2.003c.166-.197.425-.429.425-.902c0-.434-.874-.831-.469-.487c0 0 .519.237-.148 1.226c-.468-.243-1.208-.104-1.208-.104c.605.051.944.209 1.082.29c-.341.456-.728 1.002-.281 1.657c.491.722 1.111 1.455 2.133.865c1.022-.589.725-.867.191-.398" fill="#000000"></path><path d="M49.457 12.458c.484-.523.917-1.144.954-1.721a1.324 1.324 0 0 0-.354-.997c-.172-.183-.699-.74-1.483-.74c-.537 0-1.035.258-1.482.766c-.136.154-.389.414-.746.774a1.65 1.65 0 0 0-.342-.037c-.824 0-1.26.605-1.424.833l-.035.047c-.226.291-.428.808-.585 1.278c-.019-.075-.04-.146-.058-.222c0 0-1.707 1.41-2.902 2.674c0 0 .049.251.18.609c-1.377 1.593-2.974 2.732-4.433 3.54c.355-.831.544-1.871.544-3.175c0-2.71-.291-4.561-.902-5.839C42.492 8.836 38.961 2 38.961 2c-4.336 1.922-8.472.207-13.168.799c-9.313 1.175-7.273 5.56-7.273 5.56c-1.764 1.94-1.281 4.355.936 7.031c.46.556.803 1.205 1.063 1.881c.084.419.211.812.371 1.184c.246.992.349 1.971.384 2.753c-7.052 5.479-8.318 7.716-7.914 11.527a3.126 3.126 0 0 0-.358.367s.285 1.215.368 2.4c-.293.918-.634 2.951 1.002 5.15c.556.748 1.676 1.23 2.854 1.23c.596 0 1.184-.119 1.749-.35c.456-.188 1.083-.516 1.266-1.195c.196-.729-.249-1.287-.606-1.736a8.204 8.204 0 0 1-.162-.207c.282-.414.484-.961.189-1.6a2.377 2.377 0 0 0-.527-.707c-.133-.705-.264-1.955.223-2.986c0 0-.096-.214-.411-.462c.498-1.455 1.653-3.242 4.33-4.619c-.063 1.502-.405 5.099-2.12 10.218l-.081.244l.156.207c.034.043.444.566 1.374 1.086c-.346 1.195-.444 2.932.176 5.438c.816 3.297-.842 9.219-3.856 13.771l-.343.518l.592.221c.036.014.461.164 1.14.326c-.086.547-.036 1.23.434 1.951h2.942v-1.133S24.183 62 28.677 62c1.555 0 1.718-1.473.082-1.559c-.579-.031-.92-.195-1.192-.471c.27-.076.538-.152.799-.246l.499-.182l-.203-.48c-.012-.029-1.228-3.035.965-8.734c.338-.881.236-1.715.119-2.682c-.143-1.156-.313-2.561.305-4.529c.799 1.021 2.578 2.996 6.422 6.342c-.237 1.225-1.021 6.014.303 9.953l.07.211l.21.09c.05.021.319.123.936.225c-.115.562-.09 1.292.41 2.062h2.945v-1.133S41.836 62 46.331 62c1.555 0 1.719-1.473.082-1.559c-.584-.031-.924-.205-1.196-.486c.798-.104 1.212-.207 1.245-.217l.891-.23l-.67-.617c-.029-.027-2.941-2.779-4.505-10.789c-.261-1.332-1.308-2.383-2.633-3.715c-1.142-1.148-2.515-2.545-3.669-4.465c3.232-.131 4.996-.523 5.197-1.18l.049-.162l-.061-.156c-2.506-6.476-2.707-12.91-2.719-14.377c2.238-1.034 4.639-2.83 6.322-4.209c.086.039.168.082.26.116c0 0 1.878-.975 2.945-2.131l-.017-.01l.185-.112C50.527 16.177 51 15.517 51 14.833c0-.891-.787-1.752-1.543-2.375m-27.081.536c1.44.937 2.341 4.827 2.341 4.827c.98-.536.795-1.337.795-1.337c-1.273-2.865-1.754-7.088-1.754-7.088c4.273-.539 4.391 1.91 11.607 1.028c.654 1.128.899 2.894.899 5.663c0 4.381-2.212 5.223-6.567 5.302c-1.637.031-3.71-.129-5.377-.902c-.121-2.042-1.395-3.952-1.395-3.952s-.54.205-1.267-1.01c-.728-1.213-.722-3.466.718-2.531m9.177 13.73s-.489-2.395-2.023-4.333l.188-.001a21.291 21.291 0 0 0 2.043-.128c-.454 2.011-.208 4.462-.208 4.462m.017.49c2.195 5.285-.832 10.505-.832 10.505c2.177-5.808.832-10.505.832-10.505M18.574 40.611a3.546 3.546 0 0 1-1.349.271c-.932 0-1.702-.385-2.023-.816c-1.148-1.545-1.137-2.971-.97-3.818c.731-.133 1.909-.221 3.393.02c.243.119.745.404 1.006.789c.127.322-.284.844-.528.613c-.377-.354-.879-.814-.879-.814c.643.656.991 1.457.991 1.457c.558 1.162 1.828 1.695.359 2.298m3.649-2.338c2.26-6.865 2.096-10.912 2.088-11.083l-.035-.736l-.689.304c-3.416 1.506-4.918 3.645-5.565 5.419a4.53 4.53 0 0 0-.797-.188l-.718 2.847l-.682-2.779s-.698-.191-1.516.096c-.213-2.969.994-4.964 6.97-9.671c-.009.236-.021.38-.021.38c2.604.414 2.919-.57 3.017-1.313c.785.316 1.622.523 2.459.652l.188.093c.045.098.078.196.121.294l-1.777.724s.988.161 2.361.78c2.518 7.404-.053 14.267-.679 15.743c-2.893-.077-4.279-1.132-4.725-1.562m16.586 6.809c1.206 1.213 2.159 2.17 2.361 3.207c1.209 6.191 3.188 9.357 4.191 10.635c-.754.109-2.016.238-3.775.238c-2.366 0-3.498-.203-3.918-.307c-1.286-4.16-.148-9.42-.137-9.473l.063-.285l-.223-.193c-6.033-5.23-6.995-7.086-7.002-7.098l-.499-1.074l-.446 1.098c-1.098 2.697-.878 4.492-.701 5.936c.105.869.189 1.559-.063 2.213c-1.847 4.803-1.413 7.822-1.114 8.961a12.28 12.28 0 0 1-3.649.533c-1.641 0-3.01-.297-3.754-.5c2.969-4.742 4.49-10.537 3.635-13.994c-.549-2.219-.488-3.738-.228-4.766c.919.352 2.142.627 3.734.627h.325l.139-.287c.046-.092.34-.715.689-1.732l4.491.221c-.051.107-.09.182-.093.188l-.426.744h.873c.508 0 .976-.006 1.435-.016c1.267 2.269 2.819 3.845 4.092 5.124m4.929-25.801c-1.701 1.375-4.031 3.085-6.115 3.988l-.299.129l-.007.317c-.001.073-.12 7.234 2.608 14.592c-1.257-.289-3.462.213-4.987.646a54.51 54.51 0 0 1-.854.014c.757-1.85 2.247-7.064-.379-15.375c.968-.971 1.832-1.472 1.832-1.472c-.495-.513-1.532-.327-1.745-.281c.563-.186 1.07-.426 1.506-.742c1.846-.766 4.297-2.111 6.375-4.391c.125.193.264.387.436.573l2.537-1.277l-1.855 2.324c0 .001.336.482.947.955m3.754-2.427c-1.285-.801-2.26-1.954-2.734-3.303c0 0 .339-1.22.605-1.563c.125-.16.302-.485.641-.485c.153 0 .34.066.569.244c.7-.698 1.097-1.102 1.298-1.33c.247-.281.475-.417.703-.417c.233 0 .469.143.727.417c.512.541-1.43 2.14-1.43 2.14s2.102 1.328 2.102 2.276c0 .436-1.496 1.418-2.481 2.021" fill="#000000"></path><ellipse cx="27.239" cy="13.425" rx="1.489" ry="1.451" fill="#000000"></ellipse><ellipse cx="34.526" cy="13.425" rx="1.491" ry="1.451" fill="#000000"></ellipse><path d="M28.275 18.165c.465.829 1.404 1.569 2.604 1.569c1.203 0 2.145-.74 2.609-1.569c.125-.223-.042-.463-.226-.325c-1.532 1.162-3.237 1.154-4.763 0c-.184-.138-.349.102-.224.325" fill="#000000"></path></svg>
     `;
 
     const WIFE_SVG = `
@@ -51,8 +51,10 @@
 
         let womenToCreate = fraction;
 
+        console.log("gameType", gameType, gameType === "PB")
+
         for (let i = 0; i < numberOfAgents; i++) {
-            if(!fraction){
+            if(gameType === "PD"){
                 game.appendChild(drawPBAgent(i));
             } else {
                 const sex = womenToCreate > 0 ? "wife" : "husband";

diff --git a/src/ReportMaker/ReportMaker.java b/src/ReportMaker/ReportMaker.java
@@ -25,6 +25,7 @@ public void generateReport(int numberOfAgents, GameType gameType,int fraction, d
             String html = new String(Files.readAllBytes(Paths.get(reportTemplateFile)));
 
             html = html.replace("{{gameName}}", getGameName(gameType));
+            html = html.replace("{{gameType}}", "\"" + gameType + "\"");
             html = html.replace("{{messages}}", auditToJavaScriptJsonString(audit));
             html = html.replace("{{connections}}", agentNetworkToJavaScriptJsonString(network));
             html = html.replace("{{numberOfAgents}}", String.valueOf(numberOfAgents));