Merge pull request #47 from UnstableDesign/fix-bitmap

ML+Mixer Integration

Author: Devendork

package-lock.json

@@ -46,13 +46,14 @@ import { MaterialModal } from './modal/material/material.modal';
 import { FileService } from './provider/file.service';
 import { ShuttlesModal } from './modal/shuttles/shuttles.modal';
 import { DraftviewerComponent } from './draftviewer/draftviewer.component';
-import { VAE } from '../weaver/learning/vae';
 
 import { WeaverViewComponent } from './modal/weaverview/weaverview.component';
 import { SelectionComponent } from './draftviewer/selection/selection.component';
 import { SidebarComponent } from './sidebar/sidebar.component';
 import { LoomModal } from './modal/loom/loom.modal';
 import { Action } from 'rxjs/internal/scheduler/Action';
+import { VaeService } from './provider/vae.service';
+import { PatternfinderService } from './provider/patternfinder.service';
 
 @NgModule({
   imports: [
@@ -111,7 +112,8 @@ import { Action } from 'rxjs/internal/scheduler/Action';
     UploadService,
     CollectionService,
     FileService,
-    VAE //potentially need to delete
+    VaeService,
+    PatternfinderService
   ],
 
   exports: [

src/app/core/core.module.ts

@@ -729,6 +729,42 @@ class Util {
     return visited_systems;
   }
 
+  public patternToSize(pattern, warpSize, weftSize) {
+    if (pattern[0].length > warpSize) {
+        for (var i = 0; i < pattern.length; i++) {
+            while(pattern[i].length > warpSize) {
+                pattern[i].splice(pattern[i].length-1, 1);
+            }
+        }
+    }
+    if (pattern.length > weftSize) {
+        while(pattern.length > weftSize) {
+            pattern.splice(pattern.length-1, 1);
+        }
+    }
+    var idx = 0;
+    while (pattern[0].length < warpSize) {
+        for (var j = 0; j < pattern.length; j++) {
+            if (idx < pattern[j].length) {
+                pattern[j].push(pattern[j][idx]);
+            }
+        }
+        idx += 1;
+        if (idx >= pattern[0].length) {
+            idx = 0;
+        }
+    }
+    idx = 0;
+    while (pattern.length < weftSize) {
+        pattern.push(pattern[idx]);
+        idx += 1;
+        if (idx >= pattern.length) {
+            idx = 0;
+        }
+    }
+    return pattern;
+}
+
 
 }
 

src/app/core/model/util.ts

@@ -0,0 +1,27 @@
+// import { Injectable } from '@angular/core';
+// import { HttpClient, HttpResponse } from '@angular/common/http';
+
+// /**
+//  * Definition of VAE service provider (allows for access to model weights)
+//  * @class
+//  */
+// @Injectable()
+// export class VaeService {
+//     constructor(private http: HttpClient) { }
+
+//     // getVaeWeights() {
+//     //     /**TODO */
+//     // } 
+
+//     // getEncoderMeanWeights(collection: string) {
+//     //     return this.http.get('assets/encodermean' + collection + '.json', {observe: 'response'});
+//     // }
+
+//     // getEncoderLogVarWeights(collection: string) {
+//     //     return this.http.get('assets/encoderlogvar' + collection + '.json', {observe: 'response'});
+//     // }
+
+//     // getDecoderWeights(collection: string) {
+//     //     return this.http.get('assets/decoder' + collection + '.json', {observe: 'response'});
+//     // }
+// }

src/app/core/provider/oldvae.service.ts

@@ -0,0 +1,12 @@
+import { TestBed } from '@angular/core/testing';
+
+import { PatternfinderService } from './patternfinder.service';
+
+describe('PatternfinderService', () => {
+  beforeEach(() => TestBed.configureTestingModule({}));
+
+  it('should be created', () => {
+    const service: PatternfinderService = TestBed.get(PatternfinderService);
+    expect(service).toBeTruthy();
+  });
+});