fullbody support

Author: rapgru

package.json

@@ -1,6 +1,6 @@
 {
   "name": "conditionalclobber",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve --mode web",

src/services/ml-service/ml-service.js

@@ -21,6 +21,7 @@ headgear
 */
 
 function getRandomColor(type, category, gender) {
+  console.log("type " + type + "category " + category + "gender" + gender);
   return _.sample(_.toArray(svgs_).filter(s => s.gender === gender).filter(s => s.category === category).filter(s => s.type === type)).name;
 }
 
@@ -120,7 +121,7 @@ function processWeather(weather, timestart, timestop, resolution, tempstart, tem
 
   const targetPercent = squish(getPercent(calcPercent(target.avg)));
 
-  const raining = weather.daily.data[0].precipProbability > 0.1;
+  const raining = weather.daily.data[0].precipProbability > 0.25;
 
   return {
     target: targetPercent,
@@ -138,11 +139,14 @@ function processDailyWeather(weather, tempstart, tempstop) {
   const calcPercent = w => 1.0 - ((w - tempstart) / (tempstop - tempstart));
   const avg = (a, b) => (a + b) / 2.0;
 
+  const raining = weather.precipProbability > 0.25;
+
   const targetPercent = squish(getPercent(calcPercent(avg(timeWeather.apparentTemperatureHigh, timeWeather.apparentTemperatureLow))));
   return {
     target: targetPercent,
     min: squish(targetPercent - 10),
     max: squish(targetPercent + 10),
+    raining,
   };
 }
 
@@ -188,17 +192,20 @@ const categories = [
     omit: true,
   },
   {
-    name: 'jacket',
+    name: 'shoes',
     gender: true,
-    omit: true,
+    omit: false,
   },
+];
+
+const nCategories = [
   {
-    name: 'lowerbody',
+    name: 'jacket',
     gender: true,
-    omit: false,
+    omit: true,
   },
   {
-    name: 'shoes',
+    name: 'lowerbody',
     gender: true,
     omit: false,
   },
@@ -210,30 +217,80 @@ const categories = [
 ];
 
 export function predict(param) {
+  const weather = processWeather(
+    param.weather,
+    moment(param.dayInformation.start),
+    moment(param.dayInformation.stop),
+    param.settings.resolution,
+    param.settings.mintemp,
+    param.settings.maxtemp,
+  );
+
   const pieces = categories.map(predictType(
     param.gender,
-    processWeather(
-      param.weather,
-      moment(param.dayInformation.start),
-      moment(param.dayInformation.stop),
-      param.settings.resolution,
-      param.settings.mintemp,
-      param.settings.maxtemp,
-    ),
+    weather,
     false,
   ));
-  return _.reduce(pieces, _.extend);
+  const nPieces = nCategories.map(predictType(
+    param.gender,
+    weather,
+    false,
+  ));
+  const fullbody = predictType(
+    param.gender,
+    weather,
+    false,
+  )({
+    name: 'fullbody',
+    gender: true,
+    omit: false,
+  });
+
+  console.log('fullbody');
+  console.log(_.map(nPieces, x => x[_.keys(x)[0]]).filter(x => x !== ''));
+  console.log(fullbody);
+  console.log(_.map(_.map(nPieces, x => x[_.keys(x)[0]]).filter(x => x !== ''), p => _.toArray(svgs_).filter(s => s.name === p)[0].percentage));
+  console.log(_.mean(_.map(_.map(nPieces, x => x[_.keys(x)[0]]).filter(x => x !== ''), p => _.toArray(svgs_).filter(s => s.name === p)[0].percentage)));
+  console.log(_.toArray(svgs_).filter(s => s.name === fullbody.fullbody)[0].percentage);
+
+  if (Math.abs(_.mean(_.map(_.map(nPieces, x => x[_.keys(x)[0]]).filter(x => x !== ''), p => _.toArray(svgs_).filter(s => s.name === p)[0].percentage)) - weather.target) < Math.abs(_.toArray(svgs_).filter(s => s.name === fullbody.fullbody)[0].percentage - weather.target)) {
+    return _.reduce(_.flatten([pieces, [{ type: 'seperate' }], nPieces, [{ fullbody: '' }]]), _.extend);
+  }
+  return _.reduce(_.flatten([pieces, [{ type: 'fullbody' }], [fullbody], _.map(nCategories, x => ({ [x.name]: '' }))]), _.extend);
 }
 
 export function predictDay(param) {
+  const weather = processDailyWeather(
+    param.weather,
+    param.settings.mintemp,
+    param.settings.maxtemp,
+  );
+
   const pieces = categories.map(predictType(
     param.gender,
-    processDailyWeather(
-      param.weather,
-      param.settings.mintemp,
-      param.settings.maxtemp,
-    ),
+    weather,
+    true,
+  ));
+  const nPieces = nCategories.map(predictType(
+    param.gender,
+    weather,
     true,
   ));
-  return _.reduce(pieces, _.extend);
+  const fullbody = predictType(
+    param.gender,
+    weather,
+    true,
+  )({
+    name: 'fullbody',
+    gender: true,
+    omit: false,
+  });
+
+  console.log(fullbody);
+  console.log(_.map(nPieces, x => x[_.keys(x)[0]]).filter(x => x !== ''));
+
+  if (Math.abs(_.mean(_.map(_.map(nPieces, x => x[_.keys(x)[0]]).filter(x => x !== ''), p => _.toArray(svgs_).filter(s => s.type === p)[0].percentage)) - weather.target) < Math.abs(_.toArray(svgs_).filter(s => s.type === fullbody.fullbody)[0].percentage - weather.target)) {
+    return _.reduce(_.flatten([pieces, nPieces, [{ fullbody: '' }]]), _.extend);
+  }
+  return _.reduce(_.flatten([pieces, [fullbody], _.map(nCategories, x => ({ [x.name]: '' }))]), _.extend);
 }

src/services/picture-service/svgs.js

@@ -1127,16 +1127,16 @@ const svgs = {
     name: 'manExtraTrunkBlue',
     gender: 'male',
     type: 'trunk',
-    category: 'extra',
-    percentage: 5,
+    category: 'fullbody',
+    percentage: 3,
     svg: manExtraTrunkBlue,
   },
   manExtraTrunkGray: {
     name: 'manExtraTrunkGray',
     gender: 'male',
     type: 'trunk',
-    category: 'extra',
-    percentage: 5,
+    category: 'fullbody',
+    percentage: 3,
     svg: manExtraTrunkGray,
   },
   manExtraCapBlue: {

src/views/settings/Settings.vue

@@ -103,7 +103,7 @@
                 <div class="md-title">Version</div>
               </md-card-header>
               <md-card-content>
-                <p>Conditional Clobber v1.0.0</p>
+                <p>Conditional Clobber v1.1.0</p>
               </md-card-content>
             </md-card>
           </md-list-item>

src/views/travel/Travel.vue

@@ -115,7 +115,6 @@ export default {
         destination: this.destination.value,
         treturn: this.treturn.value,
       });
-      this.$router.push('/travel/result');
     },
   },
 };

src/views/travel/TravelResult.vue

@@ -46,7 +46,6 @@ export default {
   methods: {
     requery() {
       this.$store.commit('setQueryMode', true);
-      this.$router.push('/travel');
     },
   },
   computed: {

src/views/travel/travelsvgs.js

@@ -254,7 +254,7 @@ const svgs = {
     type: 'bra',
     svg: womanBra,
     display: 'bra',
-    holds: 1,
+    holds: 2,
   },
   manBikini: {
     name: 'manBikini',