Include stored moc order in output

Author: df7cb

expected/moc.out

@@ -12,10 +12,10 @@ SELECT '0/'::smoc;          -- expected: '0/'
  0/
 (1 row)
 
-SELECT '29/'::smoc;         -- expected: '0/'
+SELECT '29/'::smoc;         -- expected: '29/'
  smoc 
 ------
- 0/
+ 29/
 (1 row)
 
 SELECT '0/0-3,7'::smoc;     -- expected: '0/0-3,7'
@@ -404,15 +404,15 @@ select set_smoc_output_type(0);
 (1 row)
 
 SELECT smoc('29/32-63');
-  smoc  
---------
- 27/2-3
+    smoc    
+------------
+ 27/2-3 29/
 (1 row)
 
 SELECT smoc('29/64-127');
- smoc 
-------
- 26/1
+   smoc   
+----------
+ 26/1 29/
 (1 row)
 
 SELECT smoc('0/0-11');
@@ -536,9 +536,9 @@ SELECT smoc('5/1-127,999-1103');
 (1 row)
 
 SELECT smoc('5/1024-1103');
-   smoc    
------------
- 2/16 3/68
+     smoc     
+--------------
+ 2/16 3/68 5/
 (1 row)
 
 SELECT smoc('28/1101-1103');
@@ -568,7 +568,7 @@ SELECT sum(moc) FROM (VALUES ('0/1'::smoc), ('0/2'), ('0/4')) sub(moc);
 SELECT smoc_intersection('1/1,4-6', '1/3-5 2/8');
  smoc_intersection 
 -------------------
- 1/4-5
+ 1/4-5 2/
 (1 row)
 
 SELECT '0/1'::smoc & '1/3,5,7,9' AS intersection;
@@ -701,7 +701,7 @@ SELECT smoc_disc(0, 0, 0, 3.2);
 SELECT smoc_disc(2, 0, 0, 3.2);
  smoc_disc 
 -----------
- 0/0-11
+ 0/0-11 2/
 (1 row)
 
 SELECT smoc(6, '(0,0)'::spoint);
@@ -743,8 +743,8 @@ SELECT smoc(3, '{(.1,.1), (.1,-1), (-1,-1), (-1, .1)}'::spoly);
 CREATE TABLE g (p spoly);
 INSERT INTO g (p) VALUES (spoly '{(1.48062434277764d , -0.112757492761271d),(1.48062583213677d , -0.0763898467955446d),(1.44427278313068d, -0.0762453395638312d),(1.44413625055362d , -0.112726631135703d)}');
 SELECT smoc(6, p) FROM g;
-  smoc  
---------
- 5/4522
+   smoc    
+-----------
+ 5/4522 6/
 (1 row)
 

process_moc.cpp

@@ -721,15 +721,17 @@ void
 ascii_out(std::string & m_s, char* s, Smoc* moc, int32 begin, int32 end,
 															int32 entry_size)
 {	
+	// moc output fiddling:
+	int order = moc->order;
+	m_s.reserve(end); // rough guess
 
 	if (moc->first == moc->last)
 	{
-		m_s = "0/";
+		sprintf(s, "%d/", order);
+		m_s.append(s);
 		return;
 	}
-	// moc output fiddling:
-	int order = moc->order;
-	m_s.reserve(end); // rough guess
+
 	output_map outputs(1 + order);
 
 	for (int32 j = begin; j < end; j += entry_size)
@@ -743,7 +745,7 @@ ascii_out(std::string & m_s, char* s, Smoc* moc, int32 begin, int32 end,
 	for (int k = 0; k <= order; ++k)
 	{
 		const moc_map & output = outputs[k];
-		if (output.size())
+		if (output.size() || k == order) // always output "order/" to track input order
 		{
 			sprintf(s, "%d/", k);
 			m_s.append(s);
@@ -761,7 +763,8 @@ ascii_out(std::string & m_s, char* s, Smoc* moc, int32 begin, int32 end,
 		if (output.size())
 			*m_s.rbegin() = ' ';
 	}
-	m_s.resize(m_s.size() - 1); // strip trailing space
+	if (outputs[order].size())
+		m_s.resize(m_s.size() - 1); // strip trailing space
 }
 
 moc_out_data

sql/moc.sql

@@ -3,7 +3,7 @@ SET client_min_messages = 'notice';
 
 SELECT smoc('');            -- expected: '0/'
 SELECT '0/'::smoc;          -- expected: '0/'
-SELECT '29/'::smoc;         -- expected: '0/'
+SELECT '29/'::smoc;         -- expected: '29/'
 SELECT '0/0-3,7'::smoc;     -- expected: '0/0-3,7'
 SELECT '0/0,1,2,3,7'::smoc; -- expected: '0/0-3,7'