-
Notifications
You must be signed in to change notification settings - Fork 3
/
ChangeLog
747 lines (574 loc) · 29.5 KB
/
ChangeLog
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
.. keep this layout because it is used in CNODocs
Release 3.15.0
=================
Bioconductor release
* 1.41.1
* get rid of package Hash as it is archived on CRAN
* remove gaBinaryT2 (it was marked as depricated for a long time). Use gaBinaryTN instead.
* remove plyr dependency
Release 1.25.0
=================
Bioconductor release
* 1.11.7
* plotOptimResultsPan and plotCNOlist handles intermediate cue values (0,1) for CNORode add-on
* new toSBML() function writes the model to SBMLqual format
* makeCNOlist() can import MIDAS with multiple, continuous Cue levels
* BUG fixed:
* node name in the sif file containing the word "AND" (e.g. ligand) will not result in an AND-node anymore
* when subsetting a matrix resulted in a vector (default R behaviour), then this might caused error later when the variable was assumed to be a matrix. Therefore drop=FALSE was included in the matrix subsetting.
* plotOptimResultsPan: in the computation of root-mean-square error(for coloring the background), the NA data is not counted in the number of data points.
* readSIF reads only the unique interactions/lines
* many R CMD check warnings were fixed to be compatible with Bioconductor's standard
* version numbering was adjusted to Bioconductor’s version for maintaining consistency
* 1.11.6
* add new function called crossInhibitedData
* 1.11.5
* Fixing issue with time 0 not being simulated properly (see
https://github.com/cellnopt/CellNOptR/issues/6)
This fixes regression bug following fix made in release 1.11.3
* 1.11.4:
* fix issue https://github.com/cellnopt/CellNOptR/issues/6
* 1.11.3:
* fix gray boxes in plotOptimResultsPan
* fix bug in plotOptimResultsPan when errors were greater than 99.9% color
where white (instead of red)
* c simulator bug fix: at time 0, node that are inhibited and measured were
reset to 0 but inhibitors are off. Fix is simple: do not reset inhibitors
where time is zero
* 1.11.2:
* fix gray boxes in plotOptimResultsPand
* 1.11.1:
* add readErrors and writeErrors in CNOlist
Release 1.10.0
=================
Bioconductor release
* 1.8.3:
* because self loop are now handled properly, SBMLQaul Reader do not need
the dummy self loop anymore. The code that introduced the dummy self loop
has now been commented.
* fix variances not being properly set in CNOlist
* self loop are handled properly in prep4sim/cutnonc
* 1.8.2: fix bug in cutCNOlist
* 1.8.1: changed warning into error in checksignals and readMIDAS (missing
cellline). and add checkSignals in gaBinaryTX
Release 1.8.0
===================
Bioconductor release
Release 1.7
* 1.7.7 and 1.7.8
* readSBMLQual: self loops are replaced by a-->dummy-->a
* 1.7.6
* readSBMLQual: fixing reading AND gates properly.
* CNOlist: no need for subfield parameter. CNOlist figures out whether it should be set to True or False automatically.
* expandAndGates: can used any number of inputs (it was limited to 4). code provided by Martin-Franz-Xaver Pirkl and added/checked by TC.
* 1.7.5
* cutAndPlotResultsTN: fix a typo
* normaliseCNOlist: if called, the returned CNOlist obejct has a variance set to zero.
* prep4sim: can read SIF files that have self loops A-->A
* 1.7.4
* readSBMLQual.Rd: added missing doc.
* makecnolist: catches "NOLIG" tag in the signals/cues names.
* 1.7.3
* cutAndplot: functions returns the mse matrix
* gaBinaryT1: printing simpified for large networks
* normaliseCNOlist: EC50Noise default value set to 1
* plotOptimResultsPan: fix special cases of no or one inhibitors/stimuli
* plotCNOlist: shows the errors bar if needed
* plotOptimResultsPan: shows the errors bar if needed
* fix bug in cutNONC (notMat colnames was not populated)
* 1.7.2
* cutCNOlist: can cut time points
* plotCNOlist: yMax set to 1 if max value is below 1
* readSIF: (i) can read AND gates coded in big caps (ii) fix bug 206 for
simple network with only 1 AND gate and no other reactions
* normaliseCNOlist: fixed the negative rescaling bug
* 1.7.1
* writeMIDAS: manage absence of inhbitors
* cutAndPlotResultsTX: handle single experiment
Release 1.6.0
===================
Bioconductor release
Release 1.5
=============
* 1.5.22
* plotModel: species that belongs to inhibitor and another class are now
rounded and have a red contour.
* 1.5.21
* make C code ansi compliants
* update the tutorial/vignette.
* 1.5.19/1.5.20
* for developers: since the introduction of the cutting inside the C
simulator the code is unstable at T2. The optimisation seems ok but
cutAndPlot looks wrong. We decided to completely remove the cutting in
simulatorT1 and TN and to do the cut inside the simulatorT1/TN R code again.
This is a bit slower but at least the code is then as in 1.4.0
* 1.5.18
* convert timepoints from string to numeric to make CNORode function working
again.
* 1.5.17
* fix bug report201: cutAndPlotResult where messed up at time T2 and later
* 1.5.16
* hack plotModel to fix a bug in Rgraphviz, which is known but wil be fix
later on. layout is closer to SGBN standard.
* 1.5.15
* fixing bug in CNOlist (makeCNOlist)
* 1.5.14
* fixing manual
* add compatCNOlist to convert CNOlist class to makeCNOlist for back
compatibiltiy. This is a CNOlist class method
* add getter in CNOlist
* 1.5.13
* add model2igraph function.
* add shuffle option in randomizeCNOlist
* add variancs in makeCNOlist and adapt CNOlist accordingly.
* 1.5.12
* add a randomizeCNOlist function to add gaussian noise into a CNOlist, or
replace data by uniform distribution
* add a new plotCNOlist function called plotCNOlist2 that uses ggplot2 and
can plot 2 cnolist at the same time for comparison.
* CNOlist class has 3 new methods: length, randomize and plot accepts either one or 2 cnolist arguments.
* add verbose option in normaliseCNOlist
* readSIF can now read relation "A 1 B C D E" as excepted in SIF format.
* 1.5.11
* changes in plotOptimResultsPan: NA value are now rendered as grey boxes
instead of red boxes. The black line connecting measurements is printed.
The ylim for the y axis can be set manually to overwrite the default
behaviour.
* 1.5.10
* add cutCNOlist function that can remove signals and cues not found in a
model
* make the CNOlist print method more verbose: print the cues and signals as
in makeCNOlist
* 1.5.9
* gaBinary family function now uses the hash package instead of home-made
hash table(Task 185).
* 1.5.8
* fixed bug in gtFit (C version) to handl NA and NaN properly. Bug report 138
* 1.5.7
* fixing bug normaliseCNOlist introduced in 1.5.3 related to the new
mode="raw" option that interfered with time and control modes.
* 1.5.6
* adding exhaustive function and its manual
* fixing bug in C version of getFit that provided wrong nInTot cancelling
out effect of sizeFac.
* 1.5.5
* gaBinaryT1 and T2: fixed issue when only one model within the tolerance
was returned (bug report 167)
* 1.5.4
* remove cutAndPlotResultsT2 function (use TN version instead)
* speed up code by factor 2 in the T1 boolean case by sending matrices instead
of vectors in the call to the C function. Got some trouble here. Further
cleaning will be done later on.
* plotmodel can switch on/off the empty edges.
* 1.5.3
* add CNOdata
* add overwrite argument in writeSIF
* fixing manuals.
* fixing bug in makeCNOlist for MIDAS file with only one experiment.
* normaliseCNOlist can now handle relative data input
* 1.5.2
* computeScoreT1 and gaBinaryT1: an arbitrary time point can now be optimised.
* 1.5.1
* readMIDAS. bug fixed for the case of species that contains the DA, TR or DV
string inside their name.
Release 1.4.0
===================
Bioconductor release
Relase 1.3
============
* 1.3.33
* writeMIDAS: fix buggy case when user provide the CNOlist as the old data.frame
instead of new CNOlist class.
* prep4sim returns an extra field in the list (maxinput)
* gaBinaryT1 convert the iput CNOlist to an instance of CNOlist right at the top
so that it is not done N times within the GA algorithm itself. Speeds up things
by 3 times.
* 1.3.32
* simulatorT1 and TN have additional check for AND gates with any NA inputs (see
comments line 261 i nTN and 234 in 234)
* 1.3.31
* Updating NEW.Rd
* typo in checkSignals in warning message.
* indexFinder.R return list specifically
* fixing bug (typo) in cutAndPlotResultsT1
* writeMIDAS: nCues not used so commented
* CNOlist plot method prottotype simplified.
* buildBitString has now internal documentation.
* 1.3.30 30Aug2012
* use CNOlist class everywhere in CellNOptR
* plot method in CNOlist class calls plotCNOlist
* makeCNOlist is still there, old CNOlist object can be converted: newversion = CNOlist(oldversion)
* improve plotModel to have more graphviz options
* 1.3.29 29Aug2012
* resE is now optional in writeReport
* show options removed from cutAndPlot function family
* update entire documentation and isnt/CellNOptR-example.R makeing sure
everything works.
* add plotParams parameter in cutAndPlot family.
* fix small issues in plotOptimResultsPan( colorbar slightly shifted to the
right, colormap can be scaled towards low values, ...)
* 1.3.28
* add a TODO file
* add a .Rinstignore file.
* add a test suite in tests directory
* add class CNOlist (to fulfill bioconductor request)
* gaBinary default initBstring set to ones so no need to provide it anymore
* MAJOR refactoring to merge T1, T2, TN functions (cutAnPlot, gaBinary,
simulator).
* computeScoreT1, cutSimList had an argument called bitString. it is now called
bString and this convention is used throughout the code (e.g., bStringT1 not
bitStringT1) simlist and indexlist are now optional are after the bString
argument.
* indexList and simList are removed from the arguments and recomputede within
all functions. It may be slower but this is negligeable compared to the
simplification provided to the users. However, for back compatibilty these 2
arguments are usually kept and set to NULL.
* computeScoreT2 is now deprecated and computeScoreTN should be use instead.
* cutSimList argument called bitString renamed bString
* simulateTN combines simulateT1 and simulateTN so only one function is
required.
* add new function to make the code modular: buildBitString
* MapBack function renamed in mapBack to follow CNOdocs convention.
* fix bug in gaBinaryTN when computing score.
* gaBinaryT2 is deprecated. USe TN version instead.
* gaBinaryT1 and TN do no need the indexList and simList parameters anymore
* add missing documenation
* preprocessing now returns only the model. indices are not required anymore.
* add a cutAnPlot dispatcher that calls the proper cutandPlotResultsTX function.
* R CMD build check has no warnings or errors. All tests successful.
* 13/Aug/2012 1.3.27
* add cutAndPlot that will replace all cutAndPlot families for the user interface.
* 10/aug/2012 1.3.26
* preprocessing can now handle model without cnolist provided (e.g. for expansion only)
* 27/july/2012 1.3.25
* cSimulator for T2 (and TN)
* rev1873 add simulatorTN (T2->TN that uses c Simulator)
* cleanup computeScoreT1,T2, TN to make same similar (future release will merge T2 and TN)
* 26/july/2012 1.3.24
* rev1870,1844,1842,1841,1839,1838,1831 cSimulator implemented
* T3 data added
* 17/july/2012 1.3.23
* TN files updated and fixed
* 12/july/2012 1.3.22
* add proerties in the TN files
* Fix in cutAndPlotResultsT1
* 9/july/2012 1.3.21
* fixed bug in writeDot when only 1 stimuli present.
* 5/july/2012 1.3.20
* rev1659. add simulateT1 into gaBinaryT2, simplified CNORwrap code. fix manual, vignettes
* hash table in gaBinaryT1. option sizeFac and NAFac in gaBinaryT1 was missing.
Add maxSizeHashTable as optional argument to gaBinaryT1 and T2.
* make residualError generic for any time points.
* 26/June/2012 1.3.19
* add writeMIDAS function
* major update that changes API to uniformise the code
* computeScoreT1 and T2 are not used inside gaBinaryT1 and gaBinaryT2
* 20/June/2012 1.3.16
* rev1530: add cutModel
* 19/June/2012: 1.3.14
* rev1487. change readSif into readSIF and prep4Sim into prep4sim
* 12/June/2012: 1.3.13
* rev1465. gaBinaryT1 uses a has table to compute scores.
* 6/June/2012 1.3.11
* rev1398: faster simulatorT1 (3 times)
* rev1407: add prior knowledge bitstring in the GA algorithm (T1 and T2) (bug
report 107)
* 29/May/2010 1.3.10
* add mapBack function
* cutNONC function recompte reacID on its own so that if compresion and
expansion are not performed, reacID are correct
* 3/May/2010 1.3.9
* add computeScore.R
* 1.3.8
* new version of cutAndPlot
* 26/April/2010 1.3.7
* move sif2graph, model2sif, graph2sif
* 16/April/2010 1.3.3
* rev1025: CNORwrap NAmesData and paramsList are now optional
* rev997: fix bug 89 to allows only CellLine pattern in the MIDAS header but
also CellType.
* rev996: fix bug report 78 to use [[1]] instead of t0 to acces valueSignals in
the makecnolist objects.
* rev994: fix bug report 97 to have red links even when bstring is provided. Add
trivial sanity check in readSif to prevent "and -1 specy" reaction to be
accepted by error in a SIF file.
* rev993: fix bug report 88. NO-INHIB and NO-CYTO are not accepted following
agreement that used must use NOINHIB and NOCYTO instead. This cancels rev896
fix.
* 3/April/2010 1.3.2
* rev896: makeCNOlist removes NO-INHIB and NO-LIG columns
* 2nd/April/2010 1.3.1
* CNOR released on devel of bioconductor with revision 1.3.0, so change the
version to 1.3.1
Release 1.2
============
* 29/March/2012 1.2.0
* rev865: Increase the version to be in agreement with bioconductor
Release 1.0
=============
* 27/March/2012 0.99.30
* rev859: change color of edges in plotModel; minor update in simCutList
* 26/March/2012 0.99.29
* rev828: small fix in plotModel
* 22/March/2012 0.99.28
* rev 800-804: implement time0
* 20/March/2012 0.99.27
* rev782: cleanup in expandGates
* 15/March/2012 0.99.26
* rev739: update preprocessing to use the maxInputsPerGates option.
* rev738: fix plotModel layout
* rev737: fix major bug in expandGates and increased possible inputs combinations
* 12/March/2012 0.99.25
* rev691: and gates properly handled in the case of 3 inputs amongst which 2
links have the same input (differening only ny the lnk being inhbitor or
not). See bug report 79.
* 9/March/2012 0.99.24
* rev681: add preprocessing function
* rev680: update all documentatin, fixing errors, completing missing fields or
manual entries
* 1/March/2012 0.99.23
* rev652: add defaultParameter function.
* rev651: cutAndPlotResultsT family fixed to handle special case of a single
measurement.
* 22/Feb/2012 0.99.22
* rev589 Fix AND issue in compressModel and expandGates (bug report 61 and 62)
* 21/Feb/2012 0.99.21
* rev559 when looking at cues, makeCNOlist uses a logic that is now more
generalised and can therefore be used by fuuzy logic (cues different from 0 or
1).
* 25/Jan/012 to 17/Feb/2012 0.99.20
* rev550 writeScaffold (bug 39) if no and gates, this function was failing.
* rev548 writeScaffold (bug 39) reaction with not specy were wrongly
interpreted as edge 1 in the sif file (instead of -1).
* rev546 writeDot (bug 53) The output dot file is not in append mode anymore.
* 25/Jan/012 to 17/Feb/2012 0.99.18
* rev546 writeDot (bug 53) The output dot file is not in append mode anymore.
* rev525 plotCNOLargeList uses different device under Linux platform (not
changed for other platform)
* rev523 add feature height and width in plotCNOLargeListPDF
* rev519 make plotModel more robust
* rev500 improve plotModel to check rgraphviz version
* rev492 add headers in all files
* rev491 add properties in all files
* rev486 fix bug in makeCNOlist for the special cases (only one time at t=0)
* 25/Jan/2012 0.99.16
* add cutSimList function used now by several other functions (refactoring)
9/Jan/2012 to 23/Jan/2012 0.99.15
* rev412: Simplify gaBinaryT1/T2 cutAndPlotResultsT1/T2 and simularotT1/T2 to factorize
common code in sub-function
* rev413: Fix bug report 26 to make gaBinaryT1 working for special model cases
(small ones when only 1 cue or 1 inhibitor or 1 signal)
* rev414: Fix bug report 27 to make readMIDAS and makeCNOlist working with
special cases (e.g., no inhibitors)
* rev415: fix bug 27 (similar to rev413 and rev 412)
* rev416: add propset and Id in all source files.
* rev417: readMIDAS now ignores extra columns at the end of each rows and checks
for row length consistencies throughout the MIDAS file.
* rev419: fix bug report 31. Simple gaph such as A->B->C did not work in
makeCNOlist.
* rev422: fix bug report 32. makeCNOlist now handles cases with no inhibitors.
Fixed case of wrong colors in plotCNOlist when all cues are identical.
* rev423: fix bug report 33. plotCNOlist now handles cases where are cues equal
1 which was interpreted as being all zeros...
* rev436: fix bug report 36. makeCNOlist can now handle only 1 signal.
* rev438: fix bug reprort 37. expandGates now works with a simple case such as A->B
* rev440: fix bug report 38. readMIDAS allows to mix times
* rev452: Fix plotModel after a new release of Rgraphviz (1.33.1)
Note that this version of Rgraphviz is a devel for now.
* 9/Jan/2012 0.99.14
* change in getFit and corresponding changes in gaBinaryT1 and gaBinaryT2:
the sizePen should be divided by the total number of inputs in the model
prior to cutting. This number is now passed to getFit as an additional parameter.
* 14/7/Dev/2011 0.99.13
* make plotModel to work on Toy model and Liver data dealinbg with cnolist,
having both dot output and/or image output (e.g., PNG). bitString can also be
provided.
* 7/Dec/2011 0.99.12
* add plotModel utility
* 1/Dec/2011 0.99.11
* fix bug report cno-21 in writeDot so that nodes that belongs to signal and
inhibited classes are colored with 2 colors as in matlab version.
* 28/Nov/2011 0.99.10
* fix a bug in writeDot so that it still works when there is only one sink node
* 20/Nov/2011 0.99.9
* Fix bug http://www.ebi.ac.uk/panda/jira/browse/CNO-22 reported by Inna related
to 2 steady states. (typo in filename argument in cutAndPlotResultsT2). Similarly to
cutAndPlotResultsT1, an if statement was added to provide a tag for the filename
instead of the model name.
* Updated Rd files where needed
* 14/Nov/2011
* Update version to 0.99.8
* in the writeNetwork function: I made an escape solution for cases where the
path can't be mapped because it's too long, and this solution prints a warning
about this. As many warnings as unmapped paths will be printed. This is what I
added::
}else{
n<-n+1
#this sets those variables to NA if the path couldn't be mapped
rIn<-NA
rOut<-NA
}
}
#if the path could be mapped, we record the mapping
if(!is.na(rIn) && !is.na(rOut)){
OrigMap[rIn]<-max(OrigMap[rIn],adj[i,3])
OrigMap[rOut]<-max(OrigMap[rOut],adj[i,3])
# if the path couldn't be mapped (path too long), we print a warning, nad OrigMap
# stays 0
}else{
if(verbose == TRUE){
print("Please be aware that when mapping the scaffold network back to the PKN, compressed paths of length > 2 are ignored.")
}
}
* add the 3 t2 functions: cutAndPlotResultsT2, gaBinaryT2, simulatorT2
* add the help for all the above
* add the ToyModelMMB2.sif
* add the toy model and data corresponding for t2, as data objects (+their help pages)
* add the 2t in the vignette
* change in CNORwrap
* fix a problem in simulatorT2: the part that rewrites the nodes that are target of t2 edges wasn't working properly when there was only one t2 gate (target<-which(t2reacs[r] > 0) should actually be target<-which(t2reacs > 0))
* change in the helps of some function which have parameters referring to t2: CNORwrap (parameter "Time"), writeNetwork (parameter "optimResT2"), writeReport (parameter "optimResT2"), writeScaffold (parameter "optimResT2").
* 3d/Nov/2011
* Update version to 0.99.7
* Update the vignette to reflect the small changes made in the code (tag/verbose option)
* multicore option added into gaBinaryT1 a revision 211 and removed...Will be incorporated after v1.0
* 31/Oct/2011
* add verbose options in all functions that do print
* change fileName into filename everywhere
* add tag option (prefix) when files are saved.
* 27/oct/2011
* Copy the CNORBiocond directory (release 0.99.6) to start an official trunk.
CellNOptR_0.99.4 is based on CellNOptR_0.1 but changes a few things as asked by
* Release 0.99.6 to BioConductor 25/Oct/2011
- fix a bug in writeReport: when the files are copied to the results directory,
it now doesn't try to copy NAs anymore (the NAs are the names of files relating
to time 2 optim.)
- it changes the version number so that it is according to Bioconductor
guidelines: this number will be pushed to 1.0.0 automatically once the package
is released
- it changes the installation instructions in the vignette (this will need to be
changed again once accepted into Bioconductor)
- all the code chances in the vignette are now named
- all the code lines in the vignette have been reformatted to be under 80
characters in length
- in the vignette, the DREAM example was changed from a full example to a briefly
outlined one, the code being the same as above, just changing the name of
variables (this also avoids having too many chunks of code tagged as eval=FALSE)
- fig 4 of vignette: file size reduction
- in the vignette, all the code is now tagged as eval=TRUE, except the
installation one. This is done by now evaluating even the bits of code that
produce a file or directory, but then erasing these afterwards
- help files: all the code is not tagged as \dontrun{} anymore
- some man pages examples were shortened, wherever possible
- in help pages: code lines reformatted to not exceed 80 characters; code layout
made more aerated
- in R code: code lines reformatted to not exceed 80 characters; code layout made
more aerated
- fixes a bug in readMIDAS that was asked by reviewer who had a problem with the
line is.nan(data) -> it wasn't working for him, but anyway I don't think it was
doing what I wanted because I wanted this line to look for the character "NaN"
which is the Matlab equivalent of "NA" in R. Apparently in the reviewers dev
(unstable) version of R, is.nan does not work on data.frames (which is what
'data' is at this point in the function).
- makes the building faster compared to 0.99.3 by shortening some of the help
files: CellNOptR-package, CNORwrap, cutAndPlotResultsT1, gaBinaryT1, plotFit,
writeDot, writeNetwork, writeScaffold; and the CNORwrap part in the vignette
(essentially all this involves mainly changing the parameters of the
optimisation so that the optimisation does not explore so many solutions).
-fixes a bug in plotCNOlist and plotCNOlistLarge::
if(c != 1 && r!=1 && r!=dim(CNOlist$valueSignals[[1]])[1] &&
c != dim(CNOlist$valueSignals[[1]])[1]+1)
should be::
if(c != 1 && r!=1 && r!=dim(CNOlist$valueSignals[[1]])[1] &&
c != dim(CNOlist$valueSignals[[1]])[2]+1)
-fixes the same bug as above in plotOptimResults::
if(c != 1 && r!=1 && r!=dim(expResults[[1]])[1] && c != dim(expResults[[1]])[1]+1)
should be::
if(c != 1 && r!=1 && r!=dim(expResults[[1]])[1] && c != dim(expResults[[1]])[2]+1)
- plotOptimResults and plotCNOList/plotCNOlistLarge: Cor's email Oct 13th: some
of the code could be simplified: the code has been dramatically shortened,
rendering the above modification useless… In the plotting section, instead of
going through every possible combination or row and column index, I now do the
plot and then add the x axis (if bottom row) and the y axis (if first column)
- functions writeNetwork, writeScaffold, writeDot: simplify, make different
functions for the computing of weights and stuff and for the writing of the
network
- function writeScaffold: the global function is still called writeScaffold and
still needs the same arguments (ModelComprExpanded, optimResT1, optimResT2,
ModelOriginal=ToyModel, CNOlist), but it is divided into:
- a function writeScaffoldW that does the actual writing to files,
- a function that gets the info for the sif file,
- and a function that gets the additional info for the dot file.
.. warning::only the writeScaffold function is imported in the namespace-> it is the only
one with a help, the other function are hidden inside. if somebody wants
to get the cytoscape info without writing it to a file they need to do::
sif<-getSifInfo(ModelComprExpanded=ModelComprExpanded,
optimResT1=optimResT1,
optimResT2=optimResT2,
ModelOriginal=ModelOriginal,
CNOlist=CNOlist)
where the arguments are the same as those originally used for the
writeScaffold function then the sif file is actually sif$sifFile[,1:3], and
the attributes are sif$EAweights and sif$EApresent
- there was a typo in "writeScaffold" that meant that the dot file was called
ModelModelComprExpandedScaffold.dot instead of ModelComprExpandedScaffold.dot ->
I corrected this but this means that I had to correct the argument namesFiles of
writeReport in the vignette and in the CNORwrap function (to keep in mind when
testing the package on old test scripts).
- function writeNetwork: the global function is still called writeNetwork and
still needs the same arguments (ModelComprExpanded, optimResT1, optimResT2,
ModelOriginal, CNOlist), but it is divided into:
- a function writeSNetworkW that does the actual writing to files,
- a function that gets the info for the sif and dot files
.. warning:: only the writeNetwork function is imported in the namespace->
it is the only one with a help, the other function are hidden inside. if
somebody wants to get the cytoscape info without writing it to a file They
need to do::
nwInfo<-getNetworkInfo(
ModelOriginal=ModelOriginal,
ModelComprExpanded=ModelComprExpanded,
optimResT1=optimResT1,
optimResT2=optimResT2,
CNOlist=CNOlist)
where the arguments are the same as those originally used for the
writeScaffold function then the sif file is actually nwInfo$sifFile[,1:3],
and the attributes are nwInfo$EAweaights and nwInfo$nodesAttr
- function writeNetwork: the nodes that were neither inh/stim/sig nor NCNO did
not end up in the cytoscape node attribute file so I added a couple of lines of
code that put them in.
- naming consistency:
- GetFit -> getFit
- ResidualError-> residualError
- SimulateT1 -> simulateT1
- change in the functions
- change the function files names
- change the helps and their file names
- change the namespace
- change the scripts and the vignette
- change in the functions that use those:CNORwrap, simulatorT1, gaBinaryT1
.. warning:: careful when adding the T2 back
- readMIDAS can now handle a DA:ALL column. This has required quite some change
in the code of the function, but that shouldn't change anything for the rest of
the package since the output of the function is strictly the same. What the
function does if the number of DA and DV columns are different, and if this is
because the only DA column is a DA:ALL column, is that the function creates all
of the DA:xyz columns, so that in the end the output of readMIDAS is exactly the
same whether DA:ALL was used or not.
- readSif: the big for loop of point 2 (for(i in 1:length(AndNodes))) and the
internal for loop at point 5b (for(n in 2:length(output))) used to both use the
index i. That is now changed.
- normalizeCNOlist: I put a warning in the help file that there shouldn't be
zeros in the data (either NA or some low number, 0 is pretty unlikely as a
biochemical measurement).
- writeScaffold: I changed the names of the files produced because it caused
problems with the new version that works with multiple functions. I also had to
change the names in the CNORwrap function and in the vignette. Same for
writeNetwork.
- in the makeCNOlist: I added a bit that averages across replicate conditions if
they exist. I added a note about that in the help.
.. todo::
- make the "Large" equivalent to "plotOptimResults" (see plotCNOlistLarge)
- when replicates are available, add a section in the CNOlist that would hold
the standard deviation of each summarised measurement (only when replicates are
available for all conditions and time points).
- make the function makeCNOlist more flexible and robust?