Merge changes from WIP branch

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mi-model",
-  "version": "0.4.9",
+  "version": "0.4.10",
   "description": "Model for representing Molecular Interaction data",
   "main": "src/index.js",
   "scripts": {

public/index.html

@@ -13,9 +13,9 @@
       var model;
 
 
-      $.get( "json/EBI-9691559.json", function( data ) {
+      $.get( "json/EBI-1202920.json", function( data ) {
         model = new MIModel(data).load().then(function(m) {
-          console.log("model", m);
+          window.m = m;
         });
 
       });

src/models/Interaction.js

@@ -4,6 +4,7 @@ var Backbone = require('backbone');
 var Participants = require('./Participant').Participants;
 var Features = require('./Feature').Features;
 var Links = require('./Link').Links;
+var Expand = require('../utils/expand');
 
 var Interaction = Backbone.Model.extend({
 
@@ -13,6 +14,10 @@ var Interaction = Backbone.Model.extend({
     links: new Links()
   },
 
+  expand: function() {
+    Expand(this);
+  },
+
   initialize: function(participants) {
 
 

src/models/Participant.js

@@ -58,7 +58,15 @@ var Participant = Backbone.Model.extend({
 
 var Participants = Backbone.Collection.extend({
 
-  model: Participant
+  model: Participant,
+
+  withStoichiometry: function(){
+    filtered = this.filter(function(participant) {
+      return participant.get("stoichiometry") > 1
+    });
+
+    return new Participants(filtered);
+  }
 
 });
 

src/utils/expand.js

@@ -0,0 +1,40 @@
+var expand;
+
+
+
+nextAvailableId = function(participants) {
+
+  var ids = participants.map(function(p) {
+    return p.get("id");
+  });
+
+  return Math.max.apply(null, ids) + 1
+};
+
+expand = function(interaction) {
+  participants = interaction.get("participants").withStoichiometry();
+
+  var clones = [];
+
+  participants.each(function(p) {
+
+    for (var i = 0; i < p.get("stoichiometry"); i++) {
+      var clone = p.clone();
+      clone.set("id", nextAvailableId(participants) + i);
+      clone.set("clone?", true);
+      clone.set("fromParticipant", p);
+      interaction.get("participants").add(clone);
+    }
+
+  });
+
+
+  interaction.set("expanded?", true);
+
+  // console.log("returning", interaction);
+
+  return interaction;
+
+}
+
+module.exports = expand;