diff --git a/src/reducers/reducer.init.js b/src/reducers/reducer.init.js index dad87cb..29c917e 100644 --- a/src/reducers/reducer.init.js +++ b/src/reducers/reducer.init.js @@ -14,7 +14,7 @@ export const initState = (changesArgument: number): stateType => { '[+ occlusive - nasal]>[+ occlusive + nasal]/n_.', 'a>ɯ/._#', '[+ sonorant - low rounded high back]>0/._.', - // '[+ nasal][+ obstruent]>[+ nasal obstruent aspirated ]/#_.', + '[+ obstruent]>[+ obstruent aspirated ]/#_.', // 'nn>nun/._.', // '[+ sonorant rounded]>[+ sonorant - rounded]/._#' ] @@ -74,8 +74,8 @@ export const initState = (changesArgument: number): stateType => { occlusive: { positive:[ state.phones.t, state.phones.n, state.phones.t.ʰ ], negative: [] }, coronal: { positive:[ state.phones.t, state.phones.n, state.phones.t.ʰ ], negative: [] }, obstruent: { positive:[ state.phones.t, state.phones.n, state.phones.t.ʰ ], negative: [] }, - nasal: { positive:[ state.phones.n ], negative: [] }, - aspirated: { positive:[ state.phones.t.ʰ ], negative: [] }, + nasal: { positive:[ state.phones.n ], negative: [state.phones.t, state.phones.t.ʰ] }, + aspirated: { positive:[ state.phones.t.ʰ ], negative: [ state.phones.t ] }, } state.lexicon = [ {lexeme: 'anta', epoch: state.epochs[0]}, diff --git a/src/reducers/reducer.results.js b/src/reducers/reducer.results.js index e64c695..c1d8aa5 100644 --- a/src/reducers/reducer.results.js +++ b/src/reducers/reducer.results.js @@ -214,7 +214,6 @@ export const run = (state: stateType, action: resultsAction): stateType => { const lexiconBundle = formBundleFromLexicon(lexicon)(phones); const passResults = transformLexicon(lexiconBundle)(ruleBundle)(features); const stringifiedPassResults = passResults.map(stringifyResults); - console.log(passResults) const pass = { pass: epoch.name, lexicon: stringifiedPassResults diff --git a/src/reducers/reducer.results.test.js b/src/reducers/reducer.results.test.js index cd62116..30de2fd 100644 --- a/src/reducers/reducer.results.test.js +++ b/src/reducers/reducer.results.test.js @@ -124,6 +124,19 @@ describe('Results', () => { } ]); }); + + it('results returned through fourth sound change rule', () => { + const action = {type: 'RUN'}; + state = initState(4) + expect(stateReducer(state, action).results).toEqual([ + { + pass: 'epoch 1', + lexicon: [ + 'annɯ', 'anat', 'ant', 'annɯ', 'tʰan', 'nnɯ' + ] + } + ]); + }); // if('results returned from sound change suite', () => { // const action = {type: 'RUN'};