Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit6335bfe

Browse files
df7cbmsdemlei
authored andcommitted
Use space as moc interval separator as per recent standards
1 parent98fc1ba commit6335bfe

File tree

3 files changed

+46
-46
lines changed

3 files changed

+46
-46
lines changed

‎expected/moc.out‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ SELECT '29/'::smoc; -- expected: '0/'
2121
SELECT '0/0-3,7'::smoc; -- expected: '0/0-3,7'
2222
smoc
2323
---------
24-
0/0-3,7
24+
0/0-37
2525
(1 row)
2626

2727
SELECT '0/0,1,2,3,7'::smoc; -- expected: '0/0-3,7'
2828
smoc
2929
---------
30-
0/0-3,7
30+
0/0-37
3131
(1 row)
3232

3333
SELECT smoc_info('0/'::smoc);
@@ -312,13 +312,13 @@ SELECT '0/'::smoc; -- expected: '0/'
312312
SELECT '0/0-3,7'::smoc; -- expected: '0/0-3,7'
313313
smoc
314314
---------
315-
0/0-3,7
315+
0/0-37
316316
(1 row)
317317

318318
SELECT '0/0,1,2,3,7'::smoc; -- expected: '0/0-3,7'
319319
smoc
320320
---------
321-
0/0-3,7
321+
0/0-37
322322
(1 row)
323323

324324
select set_smoc_output_type(1);
@@ -448,19 +448,19 @@ SELECT smoc('0/3-11');
448448
SELECT smoc('0/0,3-11');
449449
smoc
450450
----------
451-
0/0,3-11
451+
0/03-11
452452
(1 row)
453453

454454
SELECT smoc('1/0,3-42');
455455
smoc
456456
-------------------
457-
0/1-9 1/0,3,40-42
457+
0/1-9 1/0 340-42
458458
(1 row)
459459

460460
SELECT smoc('29/3-42');
461461
smoc
462462
----------------------------
463-
27/1 28/1-3,8-9 29/3,40-42
463+
27/1 28/1-38-9 29/340-42
464464
(1 row)
465465

466466
SELECT smoc('29/1');
@@ -496,25 +496,25 @@ SELECT smoc('24/1 11/1 29/1');
496496
SELECT smoc('24/1 11/1 29/1,3');
497497
smoc
498498
------------------
499-
11/1 24/1 29/1,3
499+
11/1 24/1 29/13
500500
(1 row)
501501

502502
SELECT smoc('24/1 11/1 29/1,3 2/22-33');
503503
smoc
504504
--------------------------------------
505-
1/6-7 2/22-23,32-33 11/1 24/1 29/1,3
505+
1/6-7 2/22-2332-33 11/1 24/1 29/13
506506
(1 row)
507507

508508
SELECT smoc('2/22-33');
509509
smoc
510510
---------------------
511-
1/6-7 2/22-23,32-33
511+
1/6-7 2/22-2332-33
512512
(1 row)
513513

514514
SELECT smoc('24/1 11/1 29/1,3 2/22-33');
515515
smoc
516516
--------------------------------------
517-
1/6-7 2/22-23,32-33 11/1 24/1 29/1,3
517+
1/6-7 2/22-2332-33 11/1 24/1 29/13
518518
(1 row)
519519

520520
SELECT smoc('');
@@ -526,13 +526,13 @@ SELECT smoc('');
526526
SELECT smoc('1/6-7 2/22-23,32-33 11/1 24/1 29/1,3');
527527
smoc
528528
--------------------------------------
529-
1/6-7 2/22-23,32-33 11/1 24/1 29/1,3
529+
1/6-7 2/22-2332-33 11/1 24/1 29/13
530530
(1 row)
531531

532532
SELECT smoc('5/1-127,999-1103');
533533
smoc
534534
--------------------------------------------
535-
2/1,16 3/1-3,63,68 4/1-3,250-251 5/1-3,999
535+
2/116 3/1-3 6368 4/1-3250-251 5/1-3999
536536
(1 row)
537537

538538
SELECT smoc('5/1024-1103');
@@ -550,7 +550,7 @@ SELECT smoc('28/1101-1103');
550550
SELECT smoc_union('1/1,4-6', '1/3-5 2/8');
551551
smoc_union
552552
-------------
553-
1/1,3-6 2/8
553+
1/13-6 2/8
554554
(1 row)
555555

556556
SELECT '1/1'::smoc | '1/2' AS union;
@@ -562,7 +562,7 @@ SELECT '1/1'::smoc | '1/2' AS union;
562562
SELECT sum(moc) FROM (VALUES ('0/1'::smoc), ('0/2'), ('0/4')) sub(moc);
563563
sum
564564
---------
565-
0/1-2,4
565+
0/1-24
566566
(1 row)
567567

568568
SELECT smoc_intersection('1/1,4-6', '1/3-5 2/8');
@@ -574,13 +574,13 @@ SELECT smoc_intersection('1/1,4-6', '1/3-5 2/8');
574574
SELECT '0/1'::smoc & '1/3,5,7,9' AS intersection;
575575
intersection
576576
--------------
577-
1/5,7
577+
1/57
578578
(1 row)
579579

580580
SELECT '1/9,11,13,15'::smoc & '0/1,2' AS intersection;
581581
intersection
582582
--------------
583-
1/9,11
583+
1/911
584584
(1 row)
585585

586586
SELECT intersection(moc) FROM (VALUES ('0/1-4'::smoc), ('0/2-5'), (NULL)) sub(moc);
@@ -627,69 +627,69 @@ WITH mocs(x) AS (VALUES ('0/'::smoc), ('0/1'), ('0/2'), ('0/4'), ('0/1,3'), ('0/
627627
0/ | 0/1 | f | t | f | t | f | t | f | 0/1 | 0/
628628
0/ | 0/2 | f | t | f | t | f | t | f | 0/2 | 0/
629629
0/ | 0/4 | f | t | f | t | f | t | f | 0/4 | 0/
630-
0/ | 0/1,3 | f | t | f | t | f | t | f | 0/1,3 | 0/
630+
0/ | 0/13 | f | t | f | t | f | t | f | 0/13 | 0/
631631
0/ | 0/1-3 | f | t | f | t | f | t | f | 0/1-3 | 0/
632632
0/ | 0/2-4 | f | t | f | t | f | t | f | 0/2-4 | 0/
633633
0/1 | 0/ | f | t | f | f | t | f | t | 0/1 | 0/
634634
0/1 | 0/1 | t | f | t | t | f | f | t | 0/1 | 0/1
635635
0/1 | 0/2 | f | t | f | f | t | t | f | 0/1-2 | 0/
636-
0/1 | 0/4 | f | t | f | f | t | t | f | 0/1,4 | 0/
637-
0/1 | 0/1,3 | f | t | t | t | f | t | f | 0/1,3 | 0/1
636+
0/1 | 0/4 | f | t | f | f | t | t | f | 0/14 | 0/
637+
0/1 | 0/13 | f | t | t | t | f | t | f | 0/13 | 0/1
638638
0/1 | 0/1-3 | f | t | t | t | f | t | f | 0/1-3 | 0/1
639639
0/1 | 0/2-4 | f | t | f | f | t | t | f | 0/1-4 | 0/
640640
0/2 | 0/ | f | t | f | f | t | f | t | 0/2 | 0/
641641
0/2 | 0/1 | f | t | f | f | t | t | f | 0/1-2 | 0/
642642
0/2 | 0/2 | t | f | t | t | f | f | t | 0/2 | 0/2
643-
0/2 | 0/4 | f | t | f | f | t | t | f | 0/2,4 | 0/
644-
0/2 | 0/1,3 | f | t | f | f | t | t | f | 0/1-3 | 0/
643+
0/2 | 0/4 | f | t | f | f | t | t | f | 0/24 | 0/
644+
0/2 | 0/13 | f | t | f | f | t | t | f | 0/1-3 | 0/
645645
0/2 | 0/1-3 | f | t | t | t | f | t | f | 0/1-3 | 0/2
646646
0/2 | 0/2-4 | f | t | t | t | f | t | f | 0/2-4 | 0/2
647647
0/4 | 0/ | f | t | f | f | t | f | t | 0/4 | 0/
648-
0/4 | 0/1 | f | t | f | f | t | t | f | 0/1,4 | 0/
649-
0/4 | 0/2 | f | t | f | f | t | t | f | 0/2,4 | 0/
648+
0/4 | 0/1 | f | t | f | f | t | t | f | 0/14 | 0/
649+
0/4 | 0/2 | f | t | f | f | t | t | f | 0/24 | 0/
650650
0/4 | 0/4 | t | f | t | t | f | f | t | 0/4 | 0/4
651-
0/4 | 0/1,3 | f | t | f | f | t | t | f | 0/1,3-4 | 0/
651+
0/4 | 0/13 | f | t | f | f | t | t | f | 0/13-4 | 0/
652652
0/4 | 0/1-3 | f | t | f | f | t | t | f | 0/1-4 | 0/
653653
0/4 | 0/2-4 | f | t | t | t | f | t | f | 0/2-4 | 0/4
654-
0/1,3 | 0/ | f | t | f | f | t | f | t | 0/1,3 | 0/
655-
0/1,3 | 0/1 | f | t | t | f | t | f | t | 0/1,3 | 0/1
656-
0/1,3 | 0/2 | f | t | f | f | t | t | f | 0/1-3 | 0/
657-
0/1,3 | 0/4 | f | t | f | f | t | t | f | 0/1,3-4 | 0/
658-
0/1,3 | 0/1,3 | t | f | t | t | f | f | t | 0/1,3 | 0/1,3
659-
0/1,3 | 0/1-3 | f | t | t | t | f | t | f | 0/1-3 | 0/1,3
660-
0/1,3 | 0/2-4 | f | t | t | f | t | t | f | 0/1-4 | 0/3
654+
0/13 | 0/ | f | t | f | f | t | f | t | 0/13 | 0/
655+
0/13 | 0/1 | f | t | t | f | t | f | t | 0/13 | 0/1
656+
0/13 | 0/2 | f | t | f | f | t | t | f | 0/1-3 | 0/
657+
0/13 | 0/4 | f | t | f | f | t | t | f | 0/13-4 | 0/
658+
0/13 | 0/13 | t | f | t | t | f | f | t | 0/13 | 0/13
659+
0/13 | 0/1-3 | f | t | t | t | f | t | f | 0/1-3 | 0/13
660+
0/13 | 0/2-4 | f | t | t | f | t | t | f | 0/1-4 | 0/3
661661
0/1-3 | 0/ | f | t | f | f | t | f | t | 0/1-3 | 0/
662662
0/1-3 | 0/1 | f | t | t | f | t | f | t | 0/1-3 | 0/1
663663
0/1-3 | 0/2 | f | t | t | f | t | f | t | 0/1-3 | 0/2
664664
0/1-3 | 0/4 | f | t | f | f | t | t | f | 0/1-4 | 0/
665-
0/1-3 | 0/1,3 | f | t | t | f | t | f | t | 0/1-3 | 0/1,3
665+
0/1-3 | 0/13 | f | t | t | f | t | f | t | 0/1-3 | 0/13
666666
0/1-3 | 0/1-3 | t | f | t | t | f | f | t | 0/1-3 | 0/1-3
667667
0/1-3 | 0/2-4 | f | t | t | f | t | t | f | 0/1-4 | 0/2-3
668668
0/2-4 | 0/ | f | t | f | f | t | f | t | 0/2-4 | 0/
669669
0/2-4 | 0/1 | f | t | f | f | t | t | f | 0/1-4 | 0/
670670
0/2-4 | 0/2 | f | t | t | f | t | f | t | 0/2-4 | 0/2
671671
0/2-4 | 0/4 | f | t | t | f | t | f | t | 0/2-4 | 0/4
672-
0/2-4 | 0/1,3 | f | t | t | f | t | t | f | 0/1-4 | 0/3
672+
0/2-4 | 0/13 | f | t | t | f | t | t | f | 0/1-4 | 0/3
673673
0/2-4 | 0/1-3 | f | t | t | f | t | t | f | 0/1-4 | 0/2-3
674674
0/2-4 | 0/2-4 | t | f | t | t | f | f | t | 0/2-4 | 0/2-4
675675
(49 rows)
676676

677677
SELECT smoc_disc(0, 0, 0, 1);
678678
smoc_disc
679679
----------------
680-
0/0,3-5,7-8,11
680+
0/03-57-811
681681
(1 row)
682682

683683
SELECT smoc_disc(1, 0, 0, 1);
684684
smoc_disc
685685
----------------------
686-
0/0,3-4,8,11 1/22,29
686+
0/03-4 811 1/2229
687687
(1 row)
688688

689689
SELECT smoc_disc(2, 0, 0, 1);
690690
smoc_disc
691691
----------------------------------------------------------------------------------------------------------
692-
0/4 1/0,2,12-13,34-35,45,47 2/4,6,12,14,56-57,60-61,88,90-91,116-117,119,130-131,134-135,177,179,185,187
692+
0/4 1/0 212-1334-35 4547 2/4 6 12 1456-5760-61 8890-91116-117119130-131134-135177179185187
693693
(1 row)
694694

695695
SELECT smoc_disc(0, 0, 0, 3.2);
@@ -707,31 +707,31 @@ SELECT smoc_disc(2, 0, 0, 3.2);
707707
SELECT smoc(1, '<(1,1),1>'::scircle);
708708
smoc
709709
---------------------------
710-
0/0-1,3,5 1/9-11,17-19,35
710+
0/0-1 35 1/9-1117-1935
711711
(1 row)
712712

713713
SELECT smoc(3, '<(0,1.3),.5>'::scircle);
714714
smoc
715715
---------------------------------------------------------------------------------------------------------
716-
1/3,15 2/11,31,47,55 3/27,30-31,38-39,41-43,111,119,121-123,159,181-183,187,213-215,217,219,231,237,239
716+
1/315 2/11 31 4755 3/2730-3138-3941-43111119121-123159181-183187213-215217219231237239
717717
(1 row)
718718

719719
SELECT smoc(5, '{(.1,.1), (.2,.1), (.2,.2), (.1, .2)}'::spoly);
720720
smoc
721721
-----------------------------------------------------------------
722-
4/1135,1220-1221,1223,1232 5/4534,4537-4539,4586,4869,4889,4936
722+
4/11351220-122112231232 5/45344537-45394586486948894936
723723
(1 row)
724724

725725
SELECT smoc(3, '{(.1,.1), (-1,.1), (-1,-1), (.1, -1)}'::spoly);
726726
smoc
727727
----------------------------------------------------------------------------------------------------------------------------------------
728-
1/45,47 2/64,66-67,72-74,117,179,185 3/192-194,260,262-263,280,282-283,300-302,304-306,465,477,544,546,552,554-555,709-711,715,737,749
728+
1/4547 2/6466-6772-74117179185 3/192-194260262-263280282-283300-302304-306465477544546552554-555709-711715737749
729729
(1 row)
730730

731731
SELECT smoc(3, '{(.1,.1), (.1,-1), (-1,-1), (-1, .1)}'::spoly);
732732
smoc
733733
----------------------------------------------------------------------------------------------------------------------------------------
734-
1/45,47 2/64,66-67,72-74,117,179,185 3/192-194,260,262-263,280,282-283,300-302,304-306,465,477,544,546,552,554-555,709-711,715,737,749
734+
1/4547 2/6466-6772-74117179185 3/192-194260262-263280282-283300-302304-306465477544546552554-555709-711715737749
735735
(1 row)
736736

737737
CREATE TABLE g (p spoly);

‎expected/moc1.out‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,6 @@ EXPLAIN (ANALYZE, BUFFERS, TIMING OFF, SUMMARY OFF)
115115
SELECT smoc_round(4, coverage) FROM moc1;
116116
smoc_round
117117
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
118-
0/3,8-9 1/2-3,5,7,9,11,20,29,31,40,42,44-45 2/5-7,25-27,32-33,35,41-43,64-66,68-69,74-75,77-79,84-86,89-92,96-97,101,103-104,106,109-111,115,121-123,164-166,172,184-186,188 3/0-1,10-11,13-15,17-19,64,66,69,71,77-79,97-99,136-137,139,161-163,268-270,280,295,306-307,348-350,353-355,372,376,383,393-396,398,409,411,420,422,433,435,448,455,459,481-483,668-670,696,701,703,748-750,756-757,766-767 4/8-10,12,16-18,30-31,38-39,49-51,67,260,262,268,281,283,288,290,301,303,305-307,387,552-553,555,640,642-643,1084-1085,1124-1126,1136-1137,1150-1153,1166-1167,1177-1179,1218-1219,1221-1223,1404-1406,1408-1409,1411,1492,1496,1508,1512,1525-1527,1529-1531,1568,1570-1571,1588,1590,1596,1598,1600,1602,1613,1615,1712,1714,1725,1727,1729,1731,1737-1739,1796-1798,1800-1802,1815,1819,1824,1831,1835,1921-1923,2768-2770,2781-2783,2788,2792,2794-2795,2803,2809,2811,3004,3032,3040-3042,3054-3055,3059,3062-3063
118+
0/38-9 1/2-3 5 7 9 11 20 29 31 40 4244-45 2/5-725-2732-33 3541-4364-6668-6974-7577-7984-8689-9296-97101103-104106109-111115121-123164-166172184-186188 3/0-110-1113-1517-19 64 66 69 7177-7997-99136-137139161-163268-270280295306-307348-350353-355372376383393-396398409411420422433435448455459481-483668-670696701703748-750756-757766-767 4/8-10 1216-1830-3138-3949-51 67260262268281283288290301303305-307387552-553555640642-6431084-10851124-11261136-11371150-11531166-11671177-11791218-12191221-12231404-14061408-1409141114921496150815121525-15271529-153115681570-1571158815901596159816001602161316151712171417251727172917311737-17391796-17981800-1802181518191824183118351921-19232768-27702781-2783278827922794-2795280328092811300430323040-30423054-305530593062-3063
119119
(1 row)
120120

‎process_moc.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -740,15 +740,15 @@ ascii_out(std::string & m_s, char* s, Smoc* moc, int32 begin, int32 end,
740740
hpint64 first= i->first;
741741
hpint64 last= i->second -1;
742742
if (first == last)
743-
sprintf(s,"" MOC_FORMAT_64U",", first);
743+
sprintf(s,"" MOC_FORMAT_64U"", first);
744744
else
745-
sprintf(s,"" MOC_FORMAT_64U"-" MOC_FORMAT_64U",", first, last);
745+
sprintf(s,"" MOC_FORMAT_64U"-" MOC_FORMAT_64U"", first, last);
746746
m_s.append(s);
747747
}
748748
if (output.size())
749749
*m_s.rbegin() ='';
750750
}
751-
m_s.resize(m_s.size() -1);
751+
m_s.resize(m_s.size() -1);// strip trailing space
752752
}
753753

754754
moc_out_data

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp