Skip to content

Commit

Permalink
adding split support (textiles-lab#31)
Browse files Browse the repository at this point in the history 
Consists of the following commits for @gabrielle-ohlson :
* added in split (*without* append to knit passes)
* split with knit pass prior
* code/style edits.
* test file to check split w/ various conditions
* more edits.
  • Loading branch information
@gabrielle-ohlson
gabrielle-ohlson authored Apr 30, 2021
1 parent ccf1638 commit e13ca8a
Show file tree
Hide file tree
Showing 3 changed files with 157 additions and 12 deletions.
40 changes: 28 additions & 12 deletions knitout-to-kcode.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ const OP_MISS_FRONT_MISS_BACK = { name:'OP_MISS_FRONT_MISS_BACK' };
const OP_XFER_TO_BACK = { name:'OP_XFER_TO_BACK', isFront:true };
const OP_XFER_TO_FRONT = { name:'OP_XFER_TO_FRONT', isBack:true };

const OP_SPLIT = { name:'OP_SPLIT', isFront:true, isBack:true }; //the type of OP_SPLIT is determined by the type of the pass that contains it.

//return a combined operation that does 'a' then 'b' (moving right), or null if such a thing doesn't exist
function merge_ops(a,b,quarterPitch) {
//soft miss will always be replaced by another operation in the same slot:
Expand Down Expand Up @@ -135,6 +137,9 @@ const TYPE_TUCK_TUCK = {kcode:'Tu-Tu'};
const TYPE_XFER_FOUR_PASS = {front:'Xf', back:'Xf'}; //will actually get split in output
const TYPE_XFER_TWO_PASS = {front:'Xf', back:'Xf'}; //will actually get split in output

const TYPE_SPLIT_TO_BACK = {kcode: 'Tr-Rr'};
const TYPE_SPLIT_TO_FRONT = {kcode:'Rr-Tr'};

function merge_types(a,b) {
//same type, easy to merge:
if (a === b) return a;
Expand All @@ -148,28 +153,35 @@ function merge_types(a,b) {
if (a !== TYPE_XFER_FOUR_PASS && a !== TYPE_XFER_TWO_PASS) return a;
else return null;
}

//types that only define one bed get merged:
//TODO: determing whether TYPE_SPLIT_TO_BACK can be merged with TYPE_x_KNIT, or only TYPE_KNIT_x (and vice versa)
if (a === TYPE_KNIT_x) {
if (b === TYPE_x_KNIT || b === TYPE_KNIT_KNIT) return TYPE_KNIT_KNIT;
if (b === TYPE_x_KNIT || b === TYPE_KNIT_KNIT) return TYPE_KNIT_KNIT;
else if (b === TYPE_x_TUCK || b === TYPE_KNIT_TUCK) return TYPE_KNIT_TUCK;
else if (b === TYPE_SPLIT_TO_BACK) return TYPE_SPLIT_TO_BACK;
} else if (a === TYPE_x_KNIT) {
if (b === TYPE_KNIT_x || b === TYPE_KNIT_KNIT) return TYPE_KNIT_KNIT;
if (b === TYPE_KNIT_x || b === TYPE_KNIT_KNIT) return TYPE_KNIT_KNIT;
else if (b === TYPE_TUCK_x || b === TYPE_TUCK_KNIT) return TYPE_TUCK_KNIT;
else if (b === TYPE_SPLIT_TO_FRONT) return TYPE_SPLIT_TO_FRONT;
} else if (a === TYPE_TUCK_x) {
if (b === TYPE_x_KNIT || b === TYPE_TUCK_KNIT) return TYPE_TUCK_KNIT;
else if (b === TYPE_x_TUCK || b === TYPE_TUCK_TUCK) return TYPE_TUCK_TUCK;
} else if (a === TYPE_x_TUCK) {
if (b === TYPE_KNIT_x || b === TYPE_KNIT_TUCK) return TYPE_KNIT_TUCK;
else if (b === TYPE_TUCK_x || b === TYPE_TUCK_TUCK) return TYPE_TUCK_TUCK;
} else if (a === TYPE_KNIT_KNIT) {
} else if (a === TYPE_KNIT_KNIT) { //TODO: determine if split can be appended to passes with knitting on both beds
if (b === TYPE_KNIT_x || b === TYPE_x_KNIT) return TYPE_KNIT_KNIT;
} else if (a === TYPE_KNIT_TUCK) {
if (b === TYPE_KNIT_x || b === TYPE_x_TUCK) return TYPE_KNIT_TUCK;
} else if (a === TYPE_TUCK_KNIT) {
if (b === TYPE_TUCK_x || b === TYPE_x_KNIT) return TYPE_TUCK_KNIT;
} else if (a === TYPE_TUCK_TUCK) {
if (b === TYPE_TUCK_x || b === TYPE_x_TUCK) return TYPE_TUCK_TUCK;
} else if (a === TYPE_SPLIT_TO_BACK) {
if (b === TYPE_SPLIT_TO_BACK || b === TYPE_KNIT_x) return TYPE_SPLIT_TO_BACK;
} else if (a === TYPE_SPLIT_TO_FRONT) {
if (b === TYPE_SPLIT_TO_FRONT || b === TYPE_x_KNIT) return TYPE_SPLIT_TO_FRONT;
}

//return 'null' if no merge possible:
Expand Down Expand Up @@ -1012,9 +1024,6 @@ function knitoutToPasses(knitout, knitoutFile) {
if (expectNoCarriers && cs.length !== 0) {
throw "ERROR: cannot xfer with carriers (use split).";
}
if (cs.length !== 0) {
throw "ERROR: this machine does not support a split (with carriers) instruction.";
}
//make sure that 't' and 'n' align reasonably:
if (n.isBack() && t.isFront()) {
Expand All @@ -1030,9 +1039,15 @@ function knitoutToPasses(knitout, knitoutFile) {
}
//make sure that this is a valid operation, and fill in proper OP:
const type = (xferStyle === 'four-pass' ? TYPE_XFER_FOUR_PASS : TYPE_XFER_TWO_PASS);
const op = (n.isFront() ? OP_XFER_TO_BACK : OP_XFER_TO_FRONT);
d = ""; //xfer is directionless
let type;
if (cs.length !== 0) { //split case
type = (n.isFront() ? TYPE_SPLIT_TO_BACK : TYPE_SPLIT_TO_FRONT);
op = OP_SPLIT;
} else { //xfer case
d = ""; //xfer is directionless
type = (xferStyle === 'four-pass' ? TYPE_XFER_FOUR_PASS : TYPE_XFER_TWO_PASS);
op = (n.isFront() ? OP_XFER_TO_BACK : OP_XFER_TO_FRONT);
}
kickOthers(n,cs); //both xfer and split need carriers out of the way
Expand All @@ -1050,6 +1065,7 @@ function knitoutToPasses(knitout, knitoutFile) {
if (addRoller !== 0) (roller -= addRoller), (addRoller = 0);
info.slots[slotString(n)] = op;
//record stitch for both source and target locations: (not sure if this matters):
info.sizes[slotString(n)] = {};
info.sizes[slotString(t)] = {};
Expand Down Expand Up @@ -1130,8 +1146,8 @@ function passesToKCode(headers, passes, kcFile) {
else if (headers.Position === 'Right') return 251 - maxSlot;
else throw "ERROR: unrecognized position header";
})();
function frontNeedleToSlot(n) { return n - slotToNeedle }
function backNeedleToSlot(n, racking) { return n + Math.floor(racking) - slotToNeedle }
function frontNeedleToSlot(n) { return n - slotToNeedle; }
function backNeedleToSlot(n, racking) { return n + Math.floor(racking) - slotToNeedle; }
//Now convert passes to 'kcode passes' by splitting xfer passes and adding any needed carriage moves:
Expand Down
30 changes: 30 additions & 0 deletions tests/split.k
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
;!knitout-2
;;Carriers: 1 2 3 4 5 6
;;Machine: Kniterate
in 1

knit + f1 1
knit + f2 1
knit + f3 1
knit + f4 1
knit + f5 1
knit + f6 1
knit - f6 1
knit - f5 1
knit - f4 1
knit - f3 1
split - f2 b2 1
knit - f1 1

knit + f1 1
split + b2 f2 1
split + f3 b3 1
knit + f4 1
knit + f5 1
knit + f6 1

rack -1
split - f6 b7 1
rack 0
split - f5 b5 1
out 1
99 changes: 99 additions & 0 deletions tests/split.kc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
HOME
RACK:0
// ./tests/split.kc
//
//
//
//
FRNT:..../1...........___________________________________________________________________________________________________________________________------__1\__________________________________________________________________________________________________________________________...............
STIF:5555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555
REAR:..../1...........___________________________________________________________________________________________________________________________________1\__________________________________________________________________________________________________________________________...............
STIR:0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
>> Kn-Kn 1 100 100
//
//
//
//
FRNT:..............._________________________________________________________________________________________________________________________/1__------__1\__________________________________________________________________________________________________________________________...............
STIF:5555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555
REAR:..............._________________________________________________________________________________________________________________________/1___-______1\__________________________________________________________________________________________________________________________...............
STIR:5555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555
<< Tr-Rr 1 100 100
//
//
//
//
FRNT:..............._________________________________________________________________________________________________________________________/1__-__1\_______________________________________________________________________________________________________________________________...............
STIF:5555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555
REAR:..............._________________________________________________________________________________________________________________________/1_____1\_______________________________________________________________________________________________________________________________...............
STIR:0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
>> Kn-Kn 1 100 100
//
//
//
//
// (decayed from a SOFT_MISS)
FRNT:..............._________________________________________________________________________________________________________________________/1_____1\_______________________________________________________________________________________________________________________________...............
STIF:0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
REAR:..............._________________________________________________________________________________________________________________________/1_____1\_______________________________________________________________________________________________________________________________...............
STIR:0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
<< Tu-Tu 1 100 0
//
//
//
//
FRNT:..............._________________________________________________________________________________________________________________________/1___-__1\______________________________________________________________________________________________________________________________...............
STIF:5555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555
REAR:..............._________________________________________________________________________________________________________________________/1___-__1\______________________________________________________________________________________________________________________________...............
STIR:5555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555
>> Rr-Tr 1 100 0
//
//
//
//
// (decayed from a SOFT_MISS)
FRNT:...............__________________________________________________________________________________________________________________________/1_____1\______________________________________________________________________________________________________________________________...............
STIF:0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
REAR:...............__________________________________________________________________________________________________________________________/1_____1\______________________________________________________________________________________________________________________________...............
STIR:0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
<< Tu-Tu 1 100 0
//
//
//
//
FRNT:...............__________________________________________________________________________________________________________________________/1___----__1\__________________________________________________________________________________________________________________________...............
STIF:5555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555
REAR:...............__________________________________________________________________________________________________________________________/1___-_____1\__________________________________________________________________________________________________________________________...............
STIR:5555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555
>> Tr-Rr 1 100 0
//
//
//
//
RACK:-1
FRNT:...............______________________________________________________________________________________________________________________________/1__-__1\__________________________________________________________________________________________________________________________...............
STIF:5555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555
REAR:...............______________________________________________________________________________________________________________________________/1___-_1\__________________________________________________________________________________________________________________________...............
STIR:5555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555
<< Tr-Rr 1 100 0
//
//
//
//
// (decayed from a SOFT_MISS)
RACK:0
FRNT:...............______________________________________________________________________________________________________________________________/1_____1\__________________________________________________________________________________________________________________________...............
STIF:0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
REAR:...............______________________________________________________________________________________________________________________________/1_____1\__________________________________________________________________________________________________________________________...............
STIR:0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
>> Tu-Tu 1 100 0
//
//
//
//
// ; carrier out
FRNT:..../1..........._______________________________________________________________________________________________________________________________-___1\__________________________________________________________________________________________________________________________...............
STIF:5555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555
REAR:..../1..........._______________________________________________________________________________________________________________________________-___1\__________________________________________________________________________________________________________________________...............
STIR:5555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555
<< Tr-Rr 1 100 0

0 comments on commit e13ca8a

Please sign in to comment.